Merge branch '5.x' into 5.1

# Conflicts: # CHANGELOG.md # src/translations/nl/commerce.php
craftcms · Sep 3, 2024 · a295069 · a295069
2 parents 0bacac1 + 74b11b7
commit a295069
Show file tree

Hide file tree

Showing 13 changed files with 95 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -84,6 +84,15 @@
 ### System
 - Craft Commerce now requires Craft CMS 5.2 or later.
 
+## Unreleased
+
+- Fixed a SQL error that could occur when updating Commerce.
+
+## 5.0.18 - 2024-08-28
+
+- Fixed a PHP error that could occur when default addresses were set on a cart. ([#3641](https://github.com/craftcms/commerce/issues/3641))
+- Fixed a bug were the “Auto Set New Cart Addresses” store setting was not persisting when saved.
+
 ## 5.0.17 - 2024-08-21
 
 - Fixed a bug where variant indexes weren’t displaying promotion prices as currency values.

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -1000,14 +1000,14 @@ private function _registerCacheTypes(): void
         try {
             FileHelper::createDirectory($path);
         } catch (\Exception $e) {
-            Craft::error($e->getMessage());
+            Craft::$app->getErrorHandler()->logException($e);
         }
 
         Event::on(ClearCaches::class, ClearCaches::EVENT_REGISTER_CACHE_OPTIONS, static function(RegisterCacheOptionsEvent $e) use ($path) {
             try {
                 FileHelper::createDirectory($path);
             } catch (\Exception $e) {
-                Craft::error($e->getMessage());
+                Craft::$app->getErrorHandler()->logException($e);
             }
 
             $e->options[] = [

diff --git a/src/base/Purchasable.php b/src/base/Purchasable.php
@@ -987,16 +987,18 @@ public function afterSave(bool $isNew): void
             // added to inventory before it is saved as a permanent variant.
             if ($purchasableId) {
                 // Set the inventory item data
+                /** @var InventoryItem|null $inventoryItem */
                 $inventoryItem = InventoryItemRecord::find()->where(['purchasableId' => $purchasableId])->one();
                 if (!$inventoryItem) {
                     $inventoryItem = new InventoryItemRecord();
                     $inventoryItem->purchasableId = $purchasableId;
                     $inventoryItem->countryCodeOfOrigin = '';
                     $inventoryItem->administrativeAreaCodeOfOrigin = '';
                     $inventoryItem->harmonizedSystemCode = '';
+                    $inventoryItem->save();
                 }
 
-                $inventoryItem->save();
+                $this->inventoryItemId = $inventoryItem->id;
             }
         }
 

diff --git a/src/controllers/OrdersController.php b/src/controllers/OrdersController.php
@@ -1486,28 +1486,28 @@ private function _updateOrder(Order $order, $orderRequestData, bool $tryAutoSet
 
             $order->autoSetAddresses();
         } else {
-            $getAddress = static function($address, $orderId, $title) {
-                if ($address && ($address['id'] && ($address['ownerId'] != $orderId || isset($address['_copy'])))) {
+            $getAddress = static function($address, Order $order, $title) {
+                if ($address && ($address['id'] && ($address['ownerId'] != $order->id || isset($address['_copy'])))) {
                     if (isset($address['_copy'])) {
                         unset($address['_copy']);
                     }
                     $address = Craft::$app->getElements()->getElementById($address['id'], Address::class);
                     $address = Craft::$app->getElements()->duplicateElement($address, [
-                        'ownerId' => $orderId,
-                        'primaryOwnerId' => $orderId,
+                        'owner' => $order,
+                        'primaryOwner' => $order,
                         'title' => $title,
                     ]);
-                } elseif ($address && ($address['id'] && $address['ownerId'] == $orderId)) {
+                } elseif ($address && ($address['id'] && $address['ownerId'] == $order->id)) {
                     /** @var Address|null $address */
                     $address = Address::find()->ownerId($address['ownerId'])->id($address['id'])->one();
                 }
 
                 return $address;
             };
-            $billingAddress = $getAddress($submittedBillingAddress, $orderRequestData['order']['id'], Craft::t('commerce', 'Billing Address'));
+            $billingAddress = $getAddress($submittedBillingAddress, $order, Craft::t('commerce', 'Billing Address'));
             $order->setBillingAddress($billingAddress);
 
-            $shippingAddress = $getAddress($submittedShippingAddress, $orderRequestData['order']['id'], Craft::t('commerce', 'Shipping Address'));
+            $shippingAddress = $getAddress($submittedShippingAddress, $order, Craft::t('commerce', 'Shipping Address'));
             $order->setShippingAddress($shippingAddress);
 
             if (isset($orderRequestData['order']['sourceBillingAddressId'])) {

diff --git a/src/elements/Order.php b/src/elements/Order.php
@@ -1617,8 +1617,8 @@ public function autoSetAddresses(): bool
         if (!$this->_shippingAddress && !$this->shippingAddressId && $primaryShippingAddress = $user->getPrimaryShippingAddress()) {
             $this->sourceShippingAddressId = $primaryShippingAddress->id;
             $shippingAddress = Craft::$app->getElements()->duplicateElement($primaryShippingAddress, [
-                'ownerId' => $this->id,
-                'primaryOwnerId' => $this->id,
+                'owner' => $this,
+                'primaryOwner' => $this,
             ]);
             $this->setShippingAddress($shippingAddress);
             $autoSetOccurred = true;
@@ -1627,8 +1627,8 @@ public function autoSetAddresses(): bool
         if (!$this->_billingAddress && !$this->billingAddressId && $primaryBillingAddress = $user->getPrimaryBillingAddress()) {
             $this->sourceBillingAddressId = $primaryBillingAddress->id;
             $billingAddress = Craft::$app->getElements()->duplicateElement($primaryBillingAddress, [
-                'ownerId' => $this->id,
-                'primaryOwnerId' => $this->id,
+                'owner' => $this,
+                'primaryOwner' => $this,
             ]);
             $this->setBillingAddress($billingAddress);
             $autoSetOccurred = true;
@@ -3059,6 +3059,12 @@ public function getOrderAdjustments(): array
      */
     public function setAdjustments(array $adjustments): void
     {
+        $this->_orderAdjustments = [];
+
+        foreach ($adjustments as $adjustment) {
+            $adjustment->setOrder($this);
+        }
+
         $this->_orderAdjustments = $adjustments;
     }
 

diff --git a/src/elements/conditions/purchasables/CatalogPricingCustomerConditionRule.php b/src/elements/conditions/purchasables/CatalogPricingCustomerConditionRule.php
@@ -91,10 +91,9 @@ public function getExclusiveQueryParams(): array
      */
     public function modifyQuery(Query $query): void
     {
-        if (!$this->customerId) {
-            return;
-        }
+        return;
 
-        // $query->andWhere(['purchasableId' => $ids]);
+        // Doesn't modify the query as the modification
+        // of the query happens in `CatalogPricingCondition::modifyQuery()` for this rule
     }
 }
diff --git a/src/elements/traits/OrderValidatorsTrait.php b/src/elements/traits/OrderValidatorsTrait.php
@@ -46,7 +46,7 @@ public function validatePaymentSourceId(string $attribute, $params, Validator $v
             // this will confirm the payment source is valid and belongs to the orders customer
             $this->getPaymentSource();
         } catch (InvalidConfigException $e) {
-            Craft::error($e->getMessage());
+            Craft::$app->getErrorHandler()->logException($e);
             $validator->addError($this, $attribute, Craft::t('commerce', 'Invalid payment source ID: {value}'));
         }
     }

diff --git a/src/migrations/m221122_055725_multi_store.php b/src/migrations/m221122_055725_multi_store.php
@@ -62,7 +62,42 @@ public function safeUp(): bool
             $this->addColumn(Table::STORES, 'primary', $this->boolean()->defaultValue(false)->notNull());
         }
 
-        $config = ['name' => 'Primary Store', 'handle' => 'primaryStore', 'primary' => true];
+        $config = [
+            'name' => 'Primary Store',
+            'handle' => 'primaryStore',
+            'primary' => true,
+        ];
+
+        $this->update(table: Table::STORES,
+            columns: $config,
+            condition: ['id' => $storeSettings['id']],
+            updateTimestamp: false
+        );
+
+        $configKeys = [
+            'name',
+            'handle',
+            'primary',
+            'allowCheckoutWithoutPayment',
+            'allowEmptyCartOnCheckout',
+            'allowPartialPaymentOnCheckout',
+            'autoSetCartShippingMethodOption',
+            'autoSetNewCartAddresses',
+            'autoSetPaymentSource',
+            'freeOrderPaymentStrategy',
+            'minimumTotalPriceStrategy',
+            'orderReferenceFormat',
+            'requireBillingAddressAtCheckout',
+            'requireShippingAddressAtCheckout',
+            'requireShippingMethodSelectionAtCheckout',
+            'useBillingAddressForTax',
+            'validateOrganizationTaxIdAsVatId',
+        ];
+
+        $config = (new Query())
+            ->select($configKeys)
+            ->from([Table::STORES])
+            ->one();
 
         $this->update(table: Table::STORES,
             columns: $config,
@@ -75,6 +110,7 @@ public function safeUp(): bool
             ->from([Table::STORES])
             ->scalar();
 
+
         // Make project config updates
         $projectConfig = Craft::$app->getProjectConfig();
 

diff --git a/src/migrations/m231019_110814_update_variant_ownership.php b/src/migrations/m231019_110814_update_variant_ownership.php
@@ -6,6 +6,7 @@
 use craft\db\Migration;
 use craft\db\Query;
 use craft\db\Table as CraftTable;
+use yii\db\Expression;
 
 /**
  * m231019_110814_update_variant_ownership migration.
@@ -22,7 +23,7 @@ public function safeUp(): bool
             ->select([
                 'id as elementId',
                 'productId as ownerId',
-                'sortOrder',
+                new Expression('CASE WHEN [[sortOrder]] is NULL THEN 1 ELSE [[sortOrder]] END as [[sortOrder]]'),
             ])
             ->from([Table::VARIANTS])
             ->all();

diff --git a/src/models/Store.php b/src/models/Store.php
@@ -336,7 +336,7 @@ public function getConfig(): array
             'allowEmptyCartOnCheckout' => $this->getAllowEmptyCartOnCheckout(false),
             'allowPartialPaymentOnCheckout' => $this->getAllowPartialPaymentOnCheckout(false),
             'autoSetCartShippingMethodOption' => $this->getAutoSetCartShippingMethodOption(false),
-            'autoSetNewCartAddresses' => $this->getAutoSetCartShippingMethodOption(false),
+            'autoSetNewCartAddresses' => $this->getAutoSetNewCartAddresses(false),
             'autoSetPaymentSource' => $this->getAutoSetPaymentSource(false),
             'freeOrderPaymentStrategy' => $this->getFreeOrderPaymentStrategy(false),
             'handle' => $this->handle,

diff --git a/src/services/Customers.php b/src/services/Customers.php
@@ -321,8 +321,7 @@ private function _saveAddressesFromOrder(Order $order): void
             $newSourceShippingAddressId = $newAddress->id;
         } else {
             if ($saveBillingAddress) {
-                $newBillingAddress = Craft::$app->getElements()->duplicateElement(
-                    $order->getBillingAddress(),
+                $newBillingAddress = Craft::$app->getElements()->duplicateElement($order->getBillingAddress(),
                     [
                         'primaryOwner' => $order->getCustomer(),
                         'owner' => $order->getCustomer(),
@@ -354,9 +353,9 @@ private function _saveAddressesFromOrder(Order $order): void
         // Manually update the order DB record to avoid looped element saves
         if ($newSourceBillingAddressId || $newSourceShippingAddressId) {
             \craft\commerce\records\Order::updateAll([
-                    'sourceBillingAddressId' => $order->sourceBillingAddressId,
-                    'sourceShippingAddressId' => $order->sourceShippingAddressId,
-                ],
+                'sourceBillingAddressId' => $order->sourceBillingAddressId,
+                'sourceShippingAddressId' => $order->sourceShippingAddressId,
+            ],
                 [
                     'id' => $order->id,
                 ]
@@ -394,7 +393,10 @@ private function _activateUserFromOrder(Order $order): void
             }
 
             if ($billingAddress || $shippingAddress) {
-                $newAttributes = ['primaryOwner' => $user];
+                $newAttributes = [
+                    'owner' => $user,
+                    'primaryOwner' => $user,
+                ];
 
                 // If there is only one address make sure we don't add duplicates to the user
                 if ($order->hasMatchingAddresses()) {

diff --git a/src/services/Orders.php b/src/services/Orders.php
@@ -229,13 +229,21 @@ public function afterSaveAddressHandler(ModelEvent $event): void
         foreach ($carts as $cart) {
             // Update the billing address
             if ($cart->sourceBillingAddressId === $address->id) {
-                $newBillingAddress = Craft::$app->getElements()->duplicateElement($address, ['primaryOwner' => $cart, 'title' => Craft::t('commerce', 'Billing Address')]);
+                $newBillingAddress = Craft::$app->getElements()->duplicateElement($address, [
+                    'primaryOwner' => $cart,
+                    'owner' => $cart,
+                    'title' => Craft::t('commerce', 'Billing Address'),
+                ]);
                 $cart->billingAddressId = $newBillingAddress->id;
             }
 
             // Update the shipping address
             if ($cart->sourceShippingAddressId === $address->id) {
-                $newShippingAddress = Craft::$app->getElements()->duplicateElement($address, ['primaryOwner' => $cart, 'title' => Craft::t('commerce', 'Shipping Address')]);
+                $newShippingAddress = Craft::$app->getElements()->duplicateElement($address, [
+                    'primaryOwner' => $cart,
+                    'owner' => $cart,
+                    'title' => Craft::t('commerce', 'Shipping Address'),
+                ]);
                 $cart->shippingAddressId = $newShippingAddress->id;
             }
 

diff --git a/src/services/Payments.php b/src/services/Payments.php
@@ -319,7 +319,7 @@ public function processPayment(Order $order, BasePaymentForm $form, ?string &$re
                 $this->_saveTransaction($transaction);
             }
 
-            Craft::error($e->getMessage());
+            Craft::$app->getErrorHandler()->logException($e);
             throw new PaymentException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -550,7 +550,7 @@ private function _capture(Transaction $parent): Transaction
             $child->message = $e->getMessage();
             $this->_saveTransaction($child);
 
-            Craft::error($e->getMessage());
+            Craft::$app->getErrorHandler()->logException($e);
         }
 
         return $child;