Update solution to be closed to the original

craftcms · Oct 15, 2024 · b1e9170 · b1e9170
1 parent eac9852
commit b1e9170
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/src/helpers/Currency.php b/src/helpers/Currency.php
@@ -106,22 +106,17 @@ public static function formatAsCurrency($amount, mixed $currency = null, bool $c
 
         if ($format) {
             $numberFormatter = new \NumberFormatter(Craft::$app->getFormattingLocale(), \NumberFormatter::CURRENCY);
-            $moneyFormatter = new IntlMoneyFormatter($numberFormatter, new ISOCurrencies());
-            $money = Plugin::getInstance()->getCurrencies()->getTeller($currencyIso)->convertToMoney($amount);
 
-            $amount = $moneyFormatter->format($money);
-        }
+            // Strip zeros if requested and only if the amount won't have any decimal places
+            if ($stripZeros && (int)$amount == $amount) {
+                $numberFormatter->setAttribute(\NumberFormatter::MAX_FRACTION_DIGITS, 0);
+                $numberFormatter->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, 0);
+            }
 
-        if ($stripZeros) {
-            $decimalSeparator = Craft::$app->getFormattingLocale()->getNumberSymbol(\craft\i18n\Locale::SYMBOL_DECIMAL_SEPARATOR);
-            // find decimal separator and zeros based on formatting locale and number of subunits
-            $subUnit = Plugin::getInstance()->getCurrencies()->getSubunitFor($currencyIso);
-            $zeroSymbol = Craft::$app->getFormattingLocale()->getNumberSymbol(\craft\i18n\Locale::SYMBOL_ZERO_DIGIT);
-            $zerosString = $decimalSeparator . str_repeat($zeroSymbol, $subUnit);
+            $moneyFormatter = new IntlMoneyFormatter($numberFormatter, new ISOCurrencies());
+            $money = Plugin::getInstance()->getCurrencies()->getTeller($currencyIso)->convertToMoney($amount);
 
-            if (str_contains($amount, $zerosString)) {
-                $amount = str_replace($zerosString, '', $amount);
-            }
+            return $moneyFormatter->format($money);
         }
 
         return (string)$amount;