Merge branch '5.x' into 5.6

Author: lukeholder

CHANGELOG.md

@@ -1,13 +1,15 @@
 # Release Notes for Craft Commerce
 
-## Unreleased
+## 5.5.1 - 2025-12-04
 
-- Fixed a bug where tax and shipping categories weren't getting saved on the Edit variant screen. ([#4180](https://github.com/craftcms/commerce/issues/4180))
-- Fixed a bug where newly created variants weren’t visible on Edit product screens. 
+- Added `craft\commerce\models\CatalogPricingRule::afterPreparePurchasableQuery()`.
+- Fixed a bug where tax and shipping categories weren’t getting saved from the Edit variant screen. ([#4180](https://github.com/craftcms/commerce/issues/4180))
+- Fixed a bug where newly-created variants weren’t visible on product edit screens. 
 - Fixed a SQL error that could occur when viewing product indexes.
-- Fixed a PHP error that occurred when applying project config changes after updating. ([#4185](https://github.com/craftcms/commerce/issues/4185))
-- Fixed a bug where an Order’s origin was set incorrectly when creating an order in the control panel.
-- Added the missing Preview Targets UI to product type settings. ([#4127](https://github.com/craftcms/commerce/issues/4127))
+- Fixed a PHP error that could occur when applying project config changes after updating. ([#4185](https://github.com/craftcms/commerce/issues/4185))
+- Fixed a bug where an order’s origin could be set incorrectly if it was created in the control panel.
+- Fixed a bug where order edit screens weren’t formatting prices using the user’s preferred formatting locale.
+- Fixed a SQL error that could occur when generating the pricing catalog. ([#4175](https://github.com/craftcms/commerce/issues/4175))
 
 ## 5.5.0.1 - 2025-11-24
 

src/models/CatalogPricingRule.php

@@ -322,23 +322,16 @@ public function getPurchasableIds(): ?array
                 }
 
                 // We are unable to use `siteId()` on the purchasable query as it is only the subquery part that is used.
-                Event::once(ElementQuery::class, ElementQuery::EVENT_AFTER_PREPARE, function(CancelableEvent $event) use ($siteIds) {
-                    foreach ($event->sender->subQuery->where as &$value) {
-                        if (is_array($value) && isset($value['elements_sites.siteId'])) {
-                            $value['elements_sites.siteId'] = $siteIds;
-                        }
-                    }
-
-                    $event->sender->subQuery->join[] = ['LEFT JOIN', ['sitestores' => Table::SITESTORES], '[[elements_sites.siteId]] = [[sitestores.siteId]]'];
-                    $event->sender->subQuery->join[] = ['LEFT JOIN', ['purchasables_stores' => Table::PURCHASABLES_STORES], '[[purchasables_stores.storeId]] = [[sitestores.storeId]] AND [[purchasables_stores.purchasableId]] = [[elements.id]]'];
-                });
 
                 // If the rule is generating a promotional price, we need to make sure the purchasable is promotable
                 if ($this->isPromotionalPrice) {
                     $purchasableQuery->andWhere(Db::parseBooleanParam('purchasables_stores.promotable', true));
                 }
 
+                // Do this adjustment to the query once (was previously using `Event::once` but this caused issues in some edge cases)
+                $purchasableQuery->on(ElementQuery::EVENT_AFTER_PREPARE, [$this, 'afterPreparePurchasableQuery'], ['siteIds' => $siteIds]);
                 $this->_purchasableIds = $purchasableQuery->ids();
+                $purchasableQuery->off(ElementQuery::EVENT_AFTER_PREPARE, [$this, 'afterPreparePurchasableQuery']);
             }
 
             $this->_purchasableIds = $this->_purchasableIds !== null ? array_unique($this->_purchasableIds) : null;
@@ -347,6 +340,23 @@ public function getPurchasableIds(): ?array
         return $this->_purchasableIds;
     }
 
+    /**
+     * @param CancelableEvent $event
+     * @return void
+     * @since 5.5.1
+     */
+    public function afterPreparePurchasableQuery(CancelableEvent $event): void
+    {
+        foreach ($event->sender->subQuery->where as &$value) {
+            if (is_array($value) && isset($value['elements_sites.siteId'])) {
+                $value['elements_sites.siteId'] = $event->data['siteIds'];
+            }
+        }
+
+        $event->sender->subQuery->join[] = ['LEFT JOIN', ['sitestores' => Table::SITESTORES], '[[elements_sites.siteId]] = [[sitestores.siteId]]'];
+        $event->sender->subQuery->join[] = ['LEFT JOIN', ['purchasables_stores' => Table::PURCHASABLES_STORES], '[[purchasables_stores.storeId]] = [[sitestores.storeId]] AND [[purchasables_stores.purchasableId]] = [[elements.id]]'];
+    }
+
     /**
      * @return ElementConditionInterface
      */

src/templates/_components/gateways/_modalWrapper.twig

@@ -28,7 +28,7 @@
                    autocomplete="off"
                    placeholder="{{ order.outstandingBalance }}"
                    step="any" min="1" max="{{ order.outstandingBalance }}"
-                   value="{{ order.getPaymentAmount() }}" style="margin: 0 0 0 5px; width:{{ 65 + (10*order.outstandingBalance|length) }}px;">
+                   value="{{ order.getPaymentAmount()|number }}" style="margin: 0 0 0 5px; width:{{ 65 + (10*order.outstandingBalance|length) }}px;">
 
             {% set currencies = craft.commerce.paymentCurrencies.getAllPaymentCurrencies(order.store.id) %}
             {% set primaryCurrency = craft.commerce.paymentCurrencies.getPrimaryPaymentCurrency(order.store.id) %}

src/web/assets/inventory/dist/css/inventory.css

@@ -1,4 +1,13 @@
-.inventory-headers,
+.inventory-headers {
+  .ltr & {
+    justify-content: flex-end;
+  }
+
+  .rtl & {
+    justify-content: flex-start;
+  }
+}
+
 .inventory-cell {
   .ltr & {
     text-align: right;