Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145481
Change subject: (FR #1771) Always round money before handing off to Civi
......................................................................
(FR #1771) Always round money before handing off to Civi
Change-Id: I9c3363437219a8e11d04b0f3da2036ca799af34c
TODO: look up significant decimals in CLDR
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/81/145481/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 9d45137..7991e2d 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -650,13 +650,19 @@
throw new WmfException( 'INVALID_MESSAGE', "UNKNOWN_CURRENCY:
'{$msg['original_currency']}': " . $ex->getMessage() );
}
- // round the amounts and do exchange rate conversion
- $msg['fee'] = round( $msg['fee'] * $settlement_convert, 2 );
- $msg['gross'] = round( $msg['gross'] * $settlement_convert, 2 );
- $msg['net'] = round( $msg['net'] * $settlement_convert, 2 );
+ // Do exchange rate conversion
$msg['currency'] = $settlement_currency;
+ $msg['fee'] = $msg['fee'] * $settlement_convert;
+ $msg['gross'] = $msg['gross'] * $settlement_convert;
+ $msg['net'] = $msg['net'] * $settlement_convert;
}
+ // TODO: Lookup by currency
+ $significantDecimals = 2;
+ $msg['fee'] = round( $msg['fee'], $significantDecimals );
+ $msg['gross'] = round( $msg['gross'], $significantDecimals );
+ $msg['net'] = round( $msg['net'], $significantDecimals );
+
return $msg;
}
--
To view, visit https://gerrit.wikimedia.org/r/145481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c3363437219a8e11d04b0f3da2036ca799af34c
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
