dev/translation#48 Implement Brick/Money to better handle currecny va…

…lues
civicrm · Jun 14, 2020 · 6d38345 · 6d38345
1 parent 9c6d953
commit 6d38345
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 4 deletions.
diff --git a/CRM/Utils/Money.php b/CRM/Utils/Money.php
@@ -15,6 +15,9 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Brick\Money\Money;
+use Brick\Math\RoundingMode;
+
 /**
  * Money utilties
  */
@@ -135,8 +138,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);
+      return $money->minus($rightOp)->getAmount()->toFloat();
     }
   }
 

diff --git a/composer.json b/composer.json
@@ -75,7 +75,8 @@
     "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"
   },
   "scripts": {
     "post-install-cmd": [

diff --git a/composer.lock b/composer.lock