Eileen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/297374
Change subject: Fix for regression in tests.
......................................................................
Fix for regression in tests.
This seems to be a result of us moving into the next financial year - although
I can't see why. The test looks like
it was always flawed but the bug was hidden by the financial year calc.
Bug: T136252
Change-Id: Ic880081e98399a1816450a21d736f20a27decb34
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/74/297374/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 1f64f6b..abdcc2e 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2192,7 +2192,7 @@
// FIXME: if this is an edit, we should review all contributions
$wmf_donor = array();
$contribution_date = new DateTime( $receive_date );
- $isNegative =
CRM_Contribute_BAO_Contribution::isContributionStatusNegative(
$contribution->contribution_status_id );
+ $isNegative = (($contribution->total_amount < 0) ||
CRM_Contribute_BAO_Contribution::isContributionStatusNegative(
$contribution->contribution_status_id));
$fiscal_year = intval( $contribution_date->format( 'Y' ) );
if ( intval( $contribution_date->format( 'm' ) ) < 7 ) {
$fiscal_year = $fiscal_year - 1;
@@ -2205,7 +2205,7 @@
'contact_id' => $contact_id,
'contribution_status_id' => 'Completed',
'receive_date' => array('BETWEEN' =>
array($fiscal_year . '-07-01', $fiscal_year +1 . '-06-30')),
- 'total_amout' => array('>' => 0),
+ 'total_amount' => array('>' => 0),
));
$wmf_donor["is_{$fiscal_year}_donor"] =
$donationsCount ? 1 : 0;
}
@@ -2231,7 +2231,7 @@
$wmf_donor['last_donation_amount'] =
$extra['original_amount'];
}
}
- if ( $isNegative && $latestDate ) {
+ if ( $isNegative && !empty($latestDate)) {
$latestContribution =
wmf_civicrm_get_single_contribution_for_contact_by_date($contact_id,
$latestDate);
$wmf_donor['last_donation_date'] = date('YmdHis',
strtotime($latestContribution['receive_date']));
$wmf_donor['last_donation_usd'] =
$latestContribution['total_amount'];
--
To view, visit https://gerrit.wikimedia.org/r/297374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic880081e98399a1816450a21d736f20a27decb34
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
