Merge branch '5.x' into 5.2

# Conflicts:
#	src/web/assets/commerceui/dist/js/app.js
#	src/web/assets/commerceui/dist/js/app.js.map

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fixed a bug where inventory items could appear with blank descriptions on the Inventory management screen. ([#3706](https://github.com/craftcms/commerce/issues/3706))
 - Fixed a bug where additional buttons defined with `Order::EVENT_DEFINE_ADDITIONAL_BUTTONS` weren’t displayed on the Edit Order screen. ([#3692](https://github.com/craftcms/commerce/issues/3692))
 - Fixed a bug where email errors weren’t displayed on the Edit Order screen. ([#3693](https://github.com/craftcms/commerce/issues/3693))
+- Fixed a bug where `craft\commerce\helpers\Currency::formatAsCurrency()` wasn't stripping zeros. ([#3716](https://github.com/craftcms/commerce/issues/3716))
 
 ## 5.1.3 - 2024-10-02
 

package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@craftcms/vue": "^1.0.0",
     "@craftcms/webpack": "^1.1.0",
-    "axios": "^0.26.1",
+    "axios": "^0.28.0",
     "chart.js": "^2.9.4",
     "chartjs-adapter-moment": "^0.1.2",
     "craftcms-sass": "^3.5.6",

src/elements/Product.php

@@ -1426,7 +1426,10 @@ public function getMetadata(): array
     protected function searchKeywords(string $attribute): string
     {
         if ($attribute === 'sku') {
-            return $this->getVariants()->only('sku')->implode(' ');
+            return $this->getVariants()
+                ->pluck('sku')
+                ->filter(fn(?string $sku) => $sku && !PurchasableHelper::isTempSku($sku))
+                ->implode(' ');
         }
 
         return parent::searchKeywords($attribute);

src/helpers/Currency.php

@@ -106,6 +106,13 @@ public static function formatAsCurrency($amount, mixed $currency = null, bool $c
 
         if ($format) {
             $numberFormatter = new \NumberFormatter(Craft::$app->getFormattingLocale(), \NumberFormatter::CURRENCY);
+
+            // 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);
+            }
+
             $moneyFormatter = new IntlMoneyFormatter($numberFormatter, new ISOCurrencies());
             $money = Plugin::getInstance()->getCurrencies()->getTeller($currencyIso)->convertToMoney($amount);