Sync billing with shipping address on Admin Order Page

YevSent · YevSent · commit d1e6f822ce8d · 2017-10-12T21:04:50.000+03:00
- Fixed failed FAT
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1477,6 +1477,7 @@ public function setBillingAddress($address)
         // but if quote already has the billing address it won't be overridden
         if (empty($billingAddress->getCustomerAddressId())) {
             $quote->removeAddress($quote->getBillingAddress()->getId());
+            $billingAddress->setCustomerAddressId(null);
         }
         $quote->setBillingAddress($billingAddress);
 
@@ -1779,6 +1780,7 @@ public function _prepareCustomer()
             $address = $this->getShippingAddress()->setCustomerId($this->getQuote()->getCustomer()->getId());
             $this->setShippingAddress($address);
         }
+        $this->getBillingAddress()->setCustomerId($customer->getId());
         $this->getQuote()->updateCustomerData($this->getQuote()->getCustomer());
 
         $customer = $this->getQuote()->getCustomer();

Original file line number	Diff line number	Diff line change
`@@ -1477,6 +1477,7 @@ public function setBillingAddress($address)`
`1477`	`1477`	`// but if quote already has the billing address it won't be overridden`
`1478`	`1478`	`if (empty($billingAddress->getCustomerAddressId())) {`
`1479`	`1479`	`$quote->removeAddress($quote->getBillingAddress()->getId());`
	`1480`	`+ $billingAddress->setCustomerAddressId(null);`
`1480`	`1481`	`}`
`1481`	`1482`	`$quote->setBillingAddress($billingAddress);`
`1482`	`1483`
`@@ -1779,6 +1780,7 @@ public function _prepareCustomer()`
`1779`	`1780`	`$address = $this->getShippingAddress()->setCustomerId($this->getQuote()->getCustomer()->getId());`
`1780`	`1781`	`$this->setShippingAddress($address);`
`1781`	`1782`	`}`
	`1783`	`+ $this->getBillingAddress()->setCustomerId($customer->getId());`
`1782`	`1784`	`$this->getQuote()->updateCustomerData($this->getQuote()->getCustomer());`
`1783`	`1785`
`1784`	`1786`	`$customer = $this->getQuote()->getCustomer();`