Merge branch '4.x' into t9n/4.x

Author: brandonkelly

CHANGELOG.md

@@ -1,5 +1,40 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a PHP error that could occur when saving an Order. ([#3283](https://github.com/craftcms/commerce/issues/3283))
+
+## 4.8.4 - 2025-05-01
+
+- Fixed a bug where products weren’t getting updated when default variants were saved directly. ([#3988](https://github.com/craftcms/commerce/issues/3988))
+
+## 4.8.3 - 2025-03-19
+
+- Fixed a PHP error that could occur when registering a custom shipping method.
+
+## 4.8.2 - 2025-03-12
+
+- Fixed a bug where line items’ sale prices could be calculated incorrectly. ([#3928](https://github.com/craftcms/commerce/issues/3928))
+
+## 4.8.1.2 - 2025-02-10
+
+- Fixed a bug where carts’ adjustment totals could be calculated incorrectly. ([#3888](https://github.com/craftcms/commerce/issues/3888))
+
+## 4.8.1.1 - 2025-02-07
+
+- Fixed a bug where taxes and shipping totals weren’t being recalculated in `commerce/cart/*` action requests. ([#3888](https://github.com/craftcms/commerce/issues/3888))
+
+## 4.8.1 - 2025-02-05
+
+- Improved logging when a user deletion is prevented due to the user having Commerce orders. ([#3686](https://github.com/craftcms/commerce/issues/3686))
+- Added `craft\commerce\base\Gateway::transactionSupportsRefund()`.
+- Fixed a bug where the `commerce/cart/update-cart` action could return unnecessary validation errors. ([3873](https://github.com/craftcms/commerce/issues/3873))
+
+## 4.8.0.1 - 2025-02-03
+
+- Fixed a bug where the deprecated `craft\commerce\models\TaxRate::$isVat` property was still being set. ([#3874](https://github.com/craftcms/commerce/issues/3874))
+- Fixed a PHP error that could occur when updating an order’s status from the CLI. ([#3858](https://github.com/craftcms/commerce/issues/3858))
+
 ## 4.8.0 - 2025-01-30
 
 ### Store Management

src/Plugin.php

@@ -210,7 +210,7 @@ public static function editions(): array
     /**
      * @inheritDoc
      */
-    public string $schemaVersion = '4.8.0.0';
+    public string $schemaVersion = '4.8.1.0';
 
     /**
      * @inheritdoc

src/base/Gateway.php

@@ -11,6 +11,7 @@
 use craft\base\SavableComponent;
 use craft\commerce\elements\Order;
 use craft\commerce\models\payments\BasePaymentForm;
+use craft\commerce\models\Transaction;
 use craft\helpers\StringHelper;
 use craft\helpers\UrlHelper;
 
@@ -146,4 +147,14 @@ public function getTransactionHashFromWebhook(): ?string
     {
         return null;
     }
+
+    /**
+     * @param Transaction $transaction
+     * @return bool
+     * @since 4.8.1
+     */
+    public function transactionSupportsRefund(Transaction $transaction): bool
+    {
+        return true;
+    }
 }

src/elements/Order.php

@@ -42,7 +42,6 @@
 use craft\commerce\Plugin;
 use craft\commerce\records\LineItem as LineItemRecord;
 use craft\commerce\records\Order as OrderRecord;
-use craft\commerce\records\OrderAdjustment as OrderAdjustmentRecord;
 use craft\commerce\records\OrderNotice as OrderNoticeRecord;
 use craft\commerce\records\Transaction as TransactionRecord;
 use craft\commerce\validators\StoreCountryValidator;
@@ -1995,11 +1994,11 @@ public function getAvailableShippingMethodOptions(): array
     {
         // Matching will contain the core shipping methods and any plugin dynamically returned shipping methods.
         $methods = Plugin::getInstance()->getShippingMethods()->getMatchingShippingMethods($this);
-        $matchingMethodHandles = ArrayHelper::getColumn($methods, 'handle');
+        $matchingMethodHandles = ArrayHelper::getColumn($methods, fn(ShippingMethodInterface $sm) => $sm->getHandle());
 
         // Get all regular methods and add them to the list, for use only when the order is complete.
         if ($this->isCompleted) {
-            $allShippingMethods = ArrayHelper::index(Plugin::getInstance()->getShippingMethods()->getAllShippingMethods(), 'handle');
+            $allShippingMethods = ArrayHelper::index(Plugin::getInstance()->getShippingMethods()->getAllShippingMethods(), fn(ShippingMethodInterface $sm) => $sm->getHandle());
             $methods = ArrayHelper::merge($allShippingMethods, $methods);
         }
 
@@ -3402,11 +3401,6 @@ public function getMetadata(): array
      */
     private function _saveAdjustments(): void
     {
-        /** @var null|array|OrderAdjustmentRecord[] $previousAdjustments */
-        $previousAdjustments = OrderAdjustmentRecord::find()
-            ->where(['orderId' => $this->id])
-            ->all();
-
         $newAdjustmentIds = [];
 
         foreach ($this->getAdjustments() as $adjustment) {
@@ -3416,12 +3410,6 @@ private function _saveAdjustments(): void
             $adjustment->orderId = $this->id;
         }
 
-        foreach ($previousAdjustments as $previousAdjustment) {
-            if (!in_array($previousAdjustment->id, $newAdjustmentIds, false)) {
-                $previousAdjustment->delete();
-            }
-        }
-
         // Make sure all other adjustments have been cleaned up.
         Db::delete(
             Table::ORDERADJUSTMENTS,

src/elements/Product.php

@@ -889,6 +889,15 @@ public function afterSave(bool $isNew): void
             $record->defaultWidth = $defaultVariant->width ?? 0;
             $record->defaultWeight = $defaultVariant->weight ?? 0;
 
+            // Make sure to update the object
+            $this->defaultVariantId = $defaultVariant->id ?? null;
+            $this->defaultSku = $defaultVariant->skuAsText ?? '';
+            $this->defaultPrice = $defaultVariant->price ?? 0.0;
+            $this->defaultHeight = $defaultVariant->height ?? 0;
+            $this->defaultLength = $defaultVariant->length ?? 0;
+            $this->defaultWidth = $defaultVariant->width ?? 0;
+            $this->defaultWeight = $defaultVariant->weight ?? 0;
+
             // We want to always have the same date as the element table, based on the logic for updating these in the element service i.e resaving
             $record->dateUpdated = $this->dateUpdated;
             $record->dateCreated = $this->dateCreated;

src/elements/Variant.php

@@ -30,6 +30,7 @@
 use craft\elements\conditions\ElementConditionInterface;
 use craft\gql\types\DateTime;
 use craft\helpers\ArrayHelper;
+use craft\helpers\Db;
 use craft\helpers\Html;
 use craft\models\FieldLayout;
 use Throwable;
@@ -1006,6 +1007,19 @@ public function afterSave(bool $isNew): void
             }
 
             $record->save(false);
+
+            // Fallback updating of default variant data if the variant is being saved in isolation
+            if ($this->duplicateOf === null && $this->isDefault) {
+                Db::update(Table::PRODUCTS, [
+                    'defaultVariantId' => $this->id,
+                    'defaultSku' => $this->getSkuAsText(),
+                    'defaultPrice' => $this->price ?? 0.0,
+                    'defaultHeight' => $this->height ?? 0,
+                    'defaultLength' => $this->length ?? 0,
+                    'defaultWidth' => $this->width ?? 0,
+                    'defaultWeight' => $this->weight ?? 0,
+                ], ['id' => $this->productId]);
+            }
         }
 
         parent::afterSave($isNew);

src/migrations/m250210_125139_fix_cart_recalculation_modes.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace craft\commerce\migrations;
+
+use craft\commerce\db\Table;
+use craft\commerce\elements\Order;
+use craft\db\Migration;
+
+/**
+ * m250210_125139_fix_cart_recalculation_modes migration.
+ */
+class m250210_125139_fix_cart_recalculation_modes extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function safeUp(): bool
+    {
+        $this->update(Table::ORDERS, ['recalculationMode' => Order::RECALCULATION_MODE_ALL], [
+            'recalculationMode' => Order::RECALCULATION_MODE_NONE,
+            'isCompleted' => false,
+        ], [], false);
+
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function safeDown(): bool
+    {
+        echo "m250210_125139_fix_cart_recalculation_modes cannot be reverted.\n";
+        return false;
+    }
+}

src/models/LineItem.php

@@ -610,10 +610,16 @@ public function populateFromPurchasable(PurchasableInterface $purchasable): void
         $ignoreSales = false;
         foreach (Plugin::getInstance()->getDiscounts()->getAllActiveDiscounts($this->getOrder()) as $discount) {
             if (Plugin::getInstance()->getDiscounts()->matchLineItem($this, $discount, true)) {
+                // Break if matched discount is set to ignore sales.
                 $ignoreSales = $discount->ignoreSales;
                 if ($ignoreSales) {
                     break;
                 }
+
+                // Break if matched discount is set to not apply any subsequent discounts.
+                if ($discount->stopProcessing) {
+                    break;
+                }
             }
         }
 

src/models/OrderHistory.php

@@ -56,7 +56,7 @@ class OrderHistory extends Model
     /**
      * @var int|null User ID
      */
-    public ?int $userId;
+    public ?int $userId = null;
 
     /**
      * @var string|null User name or email

src/models/TaxRate.php

@@ -225,13 +225,13 @@ public function getIsEverywhere(): bool
      */
     public function getIsVat(): bool
     {
-        Craft::$app->getDeprecator()->log(__METHOD__, 'TaxRate::setIsVat() is deprecated.');
-
+        // Don't throw deprecation log as `isVat` is still set as an attribute so will be called when the model is serialized.
         return $this->hasTaxIdValidators();
     }
 
     /**
      * @param bool $isVat
+     * @throws DeprecationException
      * @deprecated in 4.8.0.
      */
     public function setIsVat(bool $isVat): void