Merge branch '5.3' into feature/com-271-improve-purchasable-stock-updating

Author: nfourtythree

CHANGELOG-WIP.md

@@ -1,15 +1,22 @@
 # Release Notes for Craft Commerce (WIP)
 
+### Store Management
+
+- Order conditions can now have a “Payment Gateway” rule. ([#3722](https://github.com/craftcms/commerce/discussions/3722))
+- Variant conditions can now have a “Product” rule.
+
 ### Administration
 
 - Added support for `to`, `bcc`, and `cc` email fields to support environment variables. ([#3738](https://github.com/craftcms/commerce/issues/3738))
-- Added an `originalCart` value to the `commerce/update-cart` failed ajax response. ([#430](https://github.com/craftcms/commerce/issues/430))
-- Added a new "Payment Gateway" order condition rule. ([#3722](https://github.com/craftcms/commerce/discussions/3722))
 
+### Development
+
+- Added an `originalCart` value to the `commerce/update-cart` failed ajax response. ([#430](https://github.com/craftcms/commerce/issues/430))
 
-### System
+### Extensibility
 
 - Added `craft\commerce\base\InventoryItemTrait`.
 - Added `craft\commerce\base\InventoryLocationTrait`.
+- Added `craft\commerce\elements\conditions\variants\ProductConditionRule`.
 - Added `craft\commerce\services\Inventory::updateInventoryLevel()`.
-- Added `craft\commerce\services\Inventory::updatePurchasableInventoryLevel()`.
+- Added `craft\commerce\services\Inventory::updatePurchasableInventoryLevel()`.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where a product’s default price was showing incorrectly on the Products index page. ([#3807](https://github.com/craftcms/commerce/issues/3807))
+- Fixed a bug where inline-editable Matrix fields weren’t saving content on product variants. ([#3805](https://github.com/craftcms/commerce/issues/3805))
+- Fixed a bug where order errors weren't showing on the Edit Order page.
+
 ## 5.2.8 - 2024-12-04
 
 - Fixed a bug where line items weren’t getting hyperlinked within Edit Order pages. ([#3792](https://github.com/craftcms/commerce/issues/3792))

src/base/Purchasable.php

@@ -1132,6 +1132,8 @@ public function afterSave(bool $isNew): void
      */
     public function afterPropagate(bool $isNew): void
     {
+        parent::afterPropagate($isNew);
+
         Plugin::getInstance()->getCatalogPricing()->createCatalogPricingJob([
             'purchasableIds' => [$this->getCanonicalId()],
             'storeId' => $this->getStoreId(),

src/controllers/OrdersController.php

@@ -1447,6 +1447,7 @@ private function _registerJavascript(array $variables): void
 
         if ($order->hasErrors()) {
             $response['order']['errors'] = $order->getErrors();
+            $response['errors'] = $order->getErrors();
             $response['error'] = Craft::t('commerce', 'The order is not valid.');
         }
 

src/elements/Variant.php

@@ -1068,6 +1068,7 @@ public function afterSave(bool $isNew): void
         parent::afterSave($isNew);
 
         if (!$this->propagating && $this->isDefault && $ownerId && $this->duplicateOf === null) {
+            // @TODO - this data is now joined in on the product query so can be removed at the next breaking change
             $defaultData = [
                 'defaultVariantId' => $this->id,
                 'defaultSku' => $this->getSkuAsText(),

src/elements/conditions/variants/ProductConditionRule.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * @link https://craftcms.com/
+ * @copyright Copyright (c) Pixel & Tonic, Inc.
+ * @license https://craftcms.github.io/license/
+ */
+
+namespace  craft\commerce\elements\conditions\variants;
+
+use Craft;
+use craft\base\conditions\BaseElementSelectConditionRule;
+use craft\base\ElementInterface;
+use craft\commerce\elements\db\VariantQuery;
+use craft\commerce\elements\Product;
+use craft\commerce\elements\Variant;
+use craft\elements\conditions\ElementConditionRuleInterface;
+use craft\elements\db\ElementQueryInterface;
+
+/**
+ * Products Condition Rule
+ *
+ * @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
+ * @since 5.3.0
+ */
+class ProductConditionRule extends BaseElementSelectConditionRule implements ElementConditionRuleInterface
+{
+    /**
+     * @inheritdoc
+     */
+    protected function elementType(): string
+    {
+        return Product::class;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel(): string
+    {
+        return Craft::t('commerce', 'Product');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExclusiveQueryParams(): array
+    {
+        return ['product', 'productId', 'primaryOwnerId', 'primaryOwner', 'owner', 'ownerId'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function modifyQuery(ElementQueryInterface $query): void
+    {
+        /** @var VariantQuery $query */
+        $query->ownerId($this->getElementId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function matchElement(ElementInterface $element): bool
+    {
+        /** @var Variant $element */
+        return $element->getOwnerId() == $this->getElementId();
+    }
+}

src/elements/conditions/variants/VariantCondition.php

@@ -25,6 +25,7 @@ class VariantCondition extends ElementCondition
     protected function selectableConditionRules(): array
     {
         return array_merge(parent::selectableConditionRules(), [
+            ProductConditionRule::class,
             SkuConditionRule::class,
         ]);
     }

src/elements/db/ProductQuery.php

@@ -768,18 +768,20 @@ protected function beforePrepare(): bool
             'commerce_products.postDate',
             'commerce_products.expiryDate',
             'subquery.price as defaultPrice',
-            'commerce_products.defaultPrice as defaultBasePrice',
+            'purchasablesstores.basePrice as defaultBasePrice',
             'commerce_products.defaultVariantId',
-            'commerce_products.defaultSku',
-            'commerce_products.defaultWeight',
-            'commerce_products.defaultLength',
-            'commerce_products.defaultWidth',
-            'commerce_products.defaultHeight',
+            'purchasables.sku as defaultSku',
+            'purchasables.weight as defaultWeight',
+            'purchasables.length as defaultLength',
+            'purchasables.width as defaultWidth',
+            'purchasables.height as defaultHeight',
             'sitestores.storeId',
         ]);
 
         // Join in sites stores to get product's store for current request
         $this->query->leftJoin(['sitestores' => Table::SITESTORES], '[[elements_sites.siteId]] = [[sitestores.siteId]]');
+        $this->query->leftJoin(['purchasables' => Table::PURCHASABLES], '[[purchasables.id]] = [[commerce_products.defaultVariantId]]');
+        $this->query->leftJoin(['purchasablesstores' => Table::PURCHASABLES_STORES], '[[purchasablesstores.purchasableId]] = [[commerce_products.defaultVariantId]] and [[sitestores.storeId]] = [[purchasablesstores.storeId]]');
 
         $this->subQuery->addSelect(['catalogprices.price']);