Katie Horn has submitted this change and it was merged.
Change subject: Changes to the WR1 processor to accept Direct Debit
......................................................................
Changes to the WR1 processor to accept Direct Debit
Needs testing...
Change-Id: I67d0dbc1fed4831ad4633c73e29a669ef82dac61
---
M sites/all/modules/globalcollect_audit/globalcollect_audit.module
1 file changed, 12 insertions(+), 7 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
index 82cf7fc..43b4844 100644
--- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module
+++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module
@@ -549,8 +549,8 @@
//then the mismatch is expected, and with a little more
checking...
// Invoice-amount-deliv = what we think it is.
// Payment-amount = what actually happened.
- if ( (int)$wr1['Invoice-amount-deliv'] ===
(int)$donor_data['AMOUNT'] ){
- $unstaged_amount = (int)wr1_amount($wr1)/100;
//it's a GC thing.
+ if ((int) $wr1['Invoice-amount-deliv'] === (int)
$donor_data['AMOUNT'] || (int) $wr1['Order-amount-deliv'] === (int)
$donor_data['AMOUNT']) {
+ $unstaged_amount = (int)wr1_amount($wr1)/100; //it's a GC thing.
$amount_problem = false;
}
}
@@ -731,8 +731,10 @@
//absolute madness. But I'm curious. So... here we go.
$currency_code_fields = array(
'Invoice-currency-deliv',
- 'Invoice-currency-local',
- 'Payment-currency',
+ 'Order-currency-deliv',
+ 'Invoice-currency-local',
+ 'Order-currency-local',
+ 'Payment-currency',
'Currency-due',
'Over-under-currency-local', //the heck you say.
);
@@ -1806,8 +1808,10 @@
'Transaction-currency',
'Payment-currency',
'Invoice-currency-deliv',
- 'Invoice-currency-local',
- 'Currency-due',
+ 'Order-currency-deliv',
+ 'Invoice-currency-local',
+ 'Order-currency-local',
+ 'Currency-due',
'Over-under-currency-local',
);
return gca_wr1_key_grinder($record, $ordered_keys, 'currency', true);
@@ -1816,7 +1820,8 @@
function wr1_date( $record ){
$ordered_keys = array(
'Date-authorised',
- 'Date-due',
+ 'Date-order',
+ 'Date-due',
);
return gca_wr1_key_grinder($record, $ordered_keys, 'date');
}
--
To view, visit https://gerrit.wikimedia.org/r/146636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67d0dbc1fed4831ad4633c73e29a669ef82dac61
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Katie Horn <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
