Merge pull request #2812 from craftcms/feature/fix-2804

Fix bug where `autoSetNewCartAddresses` was not working for new carts.

Author: lukeholder

CHANGELOG.md

@@ -6,7 +6,9 @@
 - Example templates address forms now show plain text custom fields.
 
 ### Fixed
+- Fixed a bug where the `autoSetNewCartAddresses` setting did not work. ([#2804](https://github.com/craftcms/commerce/issues/2804))
 - Fixed a PHP error that occurred when making a payment on the Edit Order page. ([#2795](https://github.com/craftcms/commerce/issues/2795))
+- Fixed a PHP error that occurred when duplicating addresses that are not owned by Users.
 - Fixed a bug when submitting a custom field on address namespace doesn't save the field. ([2809](https://github.com/craftcms/commerce/pull/2809))
 
 ## 4.0.0 - 2022-05-04

src/behaviors/CustomerAddressBehavior.php

@@ -54,6 +54,11 @@ public function afterPropagate(): void
 
         /** @var User $user */
         $user = $this->owner->getOwner();
+
+        if ($user === null || !$user instanceof User) {
+            return;
+        }
+
         $customersService = Plugin::getInstance()->getCustomers();
 
         $customer = $customersService->ensureCustomer($user);

src/elements/Order.php

@@ -44,6 +44,7 @@
 use craft\commerce\records\Transaction as TransactionRecord;
 use craft\commerce\validators\StoreCountryValidator;
 use craft\db\Query;
+use craft\elements\Address;
 use craft\elements\Address as AddressElement;
 use craft\elements\User;
 use craft\errors\ElementNotFoundException;
@@ -1433,29 +1434,38 @@ protected function defineRules(): array
     /**
      * Automatically set addresses on the order if it's a cart and `autoSetNewCartAddresses` is `true`.
      *
-     * @return void
+     * @return bool
      * @since 3.4.14
      */
-    public function autoSetAddresses(): void
+    public function autoSetAddresses(): bool
     {
         if ($this->isCompleted || !Plugin::getInstance()->getSettings()->autoSetNewCartAddresses) {
-            return;
+            return false;
         }
 
+        /** @var User|CustomerBehavior|null $user */
         $user = $this->getCustomer();
+        if (!$user) {
+            return false;
+        }
 
-        if (!$this->_shippingAddress && $user) {
-            /** @var User|CustomerBehavior $user */
-            if ($primaryShippingAddressId = $user->getPrimaryShippingAddressId()) {
-                $this->shippingAddressId = $primaryShippingAddressId;
-            }
+        $autoSetOccurred = false;
+
+        if (!$this->_shippingAddress && $primaryShippingAddress = $user->getPrimaryShippingAddress()) {
+            $this->sourceShippingAddressId = $primaryShippingAddress->id;
+            $shippingAddress = Craft::$app->getElements()->duplicateElement($primaryShippingAddress, ['ownerId' => $this->id]);
+            $this->setShippingAddress($shippingAddress);
+            $autoSetOccurred = true;
         }
 
-        if (!$this->_billingAddress && $user) {
-            if ($primaryBillingAddressId = $user->getPrimaryBillingAddressId()) {
-                $this->billingAddressId = $primaryBillingAddressId;
-            }
+        if (!$this->_billingAddress && $primaryBillingAddress = $user->getPrimaryBillingAddress()) {
+            $this->sourceBillingAddressId = $primaryBillingAddress->id;
+            $billingAddress = Craft::$app->getElements()->duplicateElement($primaryBillingAddress, ['ownerId' => $this->id]);
+            $this->setBillingAddress($billingAddress);
+            $autoSetOccurred = true;
         }
+
+        return $autoSetOccurred;
     }
 
     /**
@@ -1964,6 +1974,7 @@ public function afterSave(bool $isNew): void
         $currentUserIsCustomer = ($currentUser && $this->getCustomer() && $currentUser->id == $this->getCustomer()->id);
 
         if ($shippingAddress = $this->getShippingAddress()) {
+            $shippingAddress->ownerId = $this->id; // Always ensure the address is owned by the order
             Craft::$app->getElements()->saveElement($shippingAddress, false);
             $orderRecord->shippingAddressId = $shippingAddress->id;
             $this->setShippingAddress($shippingAddress);
@@ -1977,6 +1988,7 @@ public function afterSave(bool $isNew): void
         }
 
         if ($billingAddress = $this->getBillingAddress()) {
+            $billingAddress->ownerId = $this->id; // Always ensure the address is owned by the order
             Craft::$app->getElements()->saveElement($billingAddress, false);
             $orderRecord->billingAddressId = $billingAddress->id;
             $this->setBillingAddress($billingAddress);
@@ -1990,6 +2002,7 @@ public function afterSave(bool $isNew): void
         }
 
         if ($estimatedShippingAddress = $this->getEstimatedShippingAddress()) {
+            $estimatedShippingAddress->ownerId = $this->id; // Always ensure the address is owned by the order
             Craft::$app->getElements()->saveElement($estimatedShippingAddress, false);
             $orderRecord->estimatedShippingAddressId = $estimatedShippingAddress->id;
             $this->setEstimatedShippingAddress($estimatedShippingAddress);
@@ -2002,6 +2015,7 @@ public function afterSave(bool $isNew): void
         }
 
         if (!$this->estimatedBillingSameAsShipping && $estimatedBillingAddress = $this->getEstimatedBillingAddress()) {
+            $estimatedBillingAddress->ownerId = $this->id; // Always ensure the address is owned by the order
             Craft::$app->getElements()->saveElement($estimatedBillingAddress, false);
             $orderRecord->estimatedBillingAddressId = $estimatedBillingAddress->id;
             $this->setEstimatedBillingAddress($estimatedBillingAddress);

src/services/Carts.php

@@ -121,7 +121,11 @@ public function getCart(bool $forceSave = false): Order
             if ($currentUser) {
                 $this->_cart->setCustomer($currentUser); // Will ensure the email is also set
             }
-            $this->_cart->autoSetAddresses();
+        }
+
+        if ($this->_cart->autoSetAddresses()) {
+            // If we are auto setting address on the cart, save the cart so addresses have an ID to belong to.
+            $forceSave = true;
         }
 
         // Ensure the session knows what the current cart is.