Feature: Update all form goal blocks/shortcodes to respect the new v3 fields/queries #7380
Conversation
|
|
||
| return Money::ofMinor($results->total, give_get_option('currency'))->getAmount(); | ||
| foreach($this->getForms() as $formId) { |
There was a problem hiding this comment.
@alaca what do you think about updating the query to accept multiple form IDs? We could update the where to be a whereIn.
There was a problem hiding this comment.
That's a great idea. I added a new method forms where you can pass an array of form IDs. See 35eb534
| */ | ||
| $form_income = 0; | ||
|
|
||
| if ($args['start_date'] === $args['end_date']) { |
There was a problem hiding this comment.
I might suggest instantiating the query and setting the ->form() value and then conditionally setting a between() value, as opposed to duplicating the new DonationQuery code.
On that note, I've considered adding a ->tap($callback) method to the DonationQuery class which would be great for this.
For example:
(new DonationQuery)
->form(1)
->tap(function($query) {
if($startDate && $endDate) {
$query->between($startDate, $endDate);
}
})
->sumIndendedAmount()
;There was a problem hiding this comment.
I refactored it a bit 7ea042e
If you could add the tap method, that would be great.
Description
This PR updates all form goal blocks/shortcodes to respect the new v3 fields/queries.
[give_goal]shortcode is updated and now it supports two new argumentsstart_dateandend_datewhere the user can set a date range for the goal.Affects
Testing Instructions
Pre-review Checklist
@unreleasedtags included in DocBlocks