Merge pull request #17608 from seamuslee001/dev_translation_48

dev/translation#48 Implement Brick/Money to better handle money values
civicrm · Jun 19, 2020 · 88bc0c6 · 88bc0c6
2 parents 8debf42 + ca4cfe7
commit 88bc0c6
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 7 deletions.
diff --git a/CRM/Utils/Money.php b/CRM/Utils/Money.php
@@ -15,6 +15,10 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Brick\Money\Money;
+use Brick\Money\Context\DefaultContext;
+use Brick\Math\RoundingMode;
+
 /**
  * Money utilties
  */
@@ -135,8 +139,8 @@ public static function getCurrencyPrecision($currency = NULL) {
    */
   public static function subtractCurrencies($leftOp, $rightOp, $currency) {
     if (is_numeric($leftOp) && is_numeric($rightOp)) {
-      $precision = pow(10, self::getCurrencyPrecision($currency));
-      return (($leftOp * $precision) - ($rightOp * $precision)) / $precision;
+      $money = Money::of($leftOp, $currency, new DefaultContext(), RoundingMode::CEILING);
+      return $money->minus($rightOp)->getAmount()->toFloat();
     }
   }
 

diff --git a/composer.json b/composer.json
@@ -75,7 +75,9 @@
     "league/csv": "^9.2",
     "tplaner/when": "~3.0.0",
     "xkerman/restricted-unserialize": "~1.1",
-    "typo3/phar-stream-wrapper": "^2 || ^3.0"
+    "typo3/phar-stream-wrapper": "^2 || ^3.0",
+    "brick/money": "~0.4",
+    "ext-intl": "*"
   },
   "scripts": {
     "post-install-cmd": [

diff --git a/composer.lock b/composer.lock
diff --git a/tests/phpunit/CRM/Utils/MoneyTest.php b/tests/phpunit/CRM/Utils/MoneyTest.php
@@ -41,6 +41,7 @@ public function subtractCurrenciesDataProvider() {
       [2, 1, 'USD', 1],
       [0, 0, 'USD', 0],
       [1, 2, 'USD', -1],
+      [269.565217391, 1, 'USD', 268.57],
       [number_format(19.99, 2), number_format(20.00, 2), 'USD', number_format(-0.01, 2)],
       ['notanumber', 5.00, 'USD', NULL],
     ];