Merge remote-tracking branch 'tango-ce/MAGETWO-62044' into MAGETWO-64483

magicbunneh · magicbunneh · commit 6c7d6163c7f8 · 2017-02-15T15:01:57.000+02:00
diff --git a/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php b/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php
@@ -93,13 +93,13 @@ public function save(CartInterface $quote, ShippingAssignmentInterface $shipping
             }
         }
 
-        $shippingAddress = $quote->getShippingAddress();
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
 
         if ($shippingAddress->getCustomerAddressId()) {
             try {
                 $this->addressRepository->getById($shippingAddress->getCustomerAddressId());
             } catch (NoSuchEntityException $e) {
-                $shippingAssignment->getShipping()->getAddress()->setCustomerAddressId(null);
+                $shippingAddress->setCustomerAddressId(null);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -93,13 +93,13 @@ public function save(CartInterface $quote, ShippingAssignmentInterface $shipping`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- $shippingAddress = $quote->getShippingAddress();`
	`96`	`+ $shippingAddress = $shippingAssignment->getShipping()->getAddress();`
`97`	`97`
`98`	`98`	`if ($shippingAddress->getCustomerAddressId()) {`
`99`	`99`	`try {`
`100`	`100`	`$this->addressRepository->getById($shippingAddress->getCustomerAddressId());`
`101`	`101`	`} catch (NoSuchEntityException $e) {`
`102`		`- $shippingAssignment->getShipping()->getAddress()->setCustomerAddressId(null);`
	`102`	`+ $shippingAddress->setCustomerAddressId(null);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`