Awight has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/145482

Change subject: Slightly stronger assertion during contrib amount normalization
......................................................................

Slightly stronger assertion during contrib amount normalization

Only copy original_amount/currency to gateway settled field as a
pair, never one without the other.

Change-Id: I9e4abae01a75145147737ac8c0022403b1ce4937
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 2 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/145482/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 7991e2d..df76316 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -622,11 +622,9 @@
         return $msg;
     }
 
-    if ( empty( $msg['original_gross'] ) ) {
-        $msg['original_gross'] = $msg['gross'];
-    }
-    if ( empty( $msg['original_currency'] ) ) {
+    if ( empty( $msg['original_currency'] ) && empty( $msg['original_gross'] ) 
) {
         $msg['original_currency'] = $msg['currency'];
+        $msg['original_gross'] = $msg['gross'];
     }
 
     if ( !array_key_exists('fee', $msg) && !array_key_exists('net', $msg) ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/145482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4abae01a75145147737ac8c0022403b1ce4937
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to