Fixed auto setting addresses when retrieving a cart fixes #1476

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 - Fixed a bug where “Purchase Total” and “Purchase Quantity” discount conditions weren’t being applied correctly. ([#1389](https://github.com/craftcms/commerce/issues/1389))
 - Fixed a bug where transaction information could show as undefined. ([#1467](https://github.com/craftcms/commerce/issues/1467))
+- Fixed a bug where addresses weren’t being set when retrieving a cart. ([#1476](https://github.com/craftcms/commerce/issues/1476))
 
 ## 3.1.5 - 2020-05-27
 

src/services/Carts.php

@@ -58,10 +58,12 @@ class Carts extends Component
      */
     public function getCart($forceSave = false): Order
     {
+        $customerId = Plugin::getInstance()->getCustomers()->getCustomerId();
+
         // If there is no cart set for this request, and we can't get a cart from session, create one.
         if (null === $this->_cart && !$this->_cart = $this->_getCart()) {
             $this->forgetCart(); // TODO: Probably remove this so we don't get a new cart number on every request?
-            $this->_cart = new Order();
+            $this->_cart = new Order(['customerId' => $customerId]);
             $this->_cart->number = $this->getSessionCartNumber();
         }
 
@@ -80,7 +82,7 @@ public function getCart($forceSave = false): Order
         $this->_cart->orderLanguage = Craft::$app->language;
         $this->_cart->currency = Plugin::getInstance()->getPaymentCurrencies()->getPrimaryPaymentCurrencyIso();
         $this->_cart->paymentCurrency = $this->_getCartPaymentCurrencyIso();
-        $this->_cart->customerId = Plugin::getInstance()->getCustomers()->getCustomerId();
+        $this->_cart->customerId = $customerId;
         $this->_cart->origin = Order::ORIGIN_WEB;
 
         $changedIp = $originalIp != $this->_cart->lastIp;