MAGETWO-33112: Refactor code that uses customer builders in Sales module

Yu Tang · Yu Tang · commit 465b4a7f84e9 · 2015-02-04T22:29:19.000-06:00
- Fixed integration test failure
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1769,19 +1769,19 @@ protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)
             if (isset($billingAddressDataObject) && $isShippingAsBilling) {
                 /** Set existing billing address as default shipping */
                 $customerAddress = $billingAddressDataObject;
-                $customerAddress->setDefaultShipping(true);
+                $customerAddress->setIsDefaultShipping(true);
             }
         }
 
         switch ($addressType) {
             case \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_BILLING:
                 if (is_null($customer->getDefaultBilling())) {
-                    $customerAddress->setDefaultBilling(true);
+                    $customerAddress->setIsDefaultBilling(true);
                 }
                 break;
             case \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING:
                 if (is_null($customer->getDefaultShipping())) {
-                    $customerAddress->setDefaultShipping(true);
+                    $customerAddress->setIsDefaultShipping(true);
                 }
                 break;
             default:

Original file line number	Diff line number	Diff line change
`@@ -1769,19 +1769,19 @@ protected function _prepareCustomerAddress($customer, $quoteCustomerAddress)`
`1769`	`1769`	`if (isset($billingAddressDataObject) && $isShippingAsBilling) {`
`1770`	`1770`	`/** Set existing billing address as default shipping */`
`1771`	`1771`	`$customerAddress = $billingAddressDataObject;`
`1772`		`- $customerAddress->setDefaultShipping(true);`
	`1772`	`+ $customerAddress->setIsDefaultShipping(true);`
`1773`	`1773`	`}`
`1774`	`1774`	`}`
`1775`	`1775`
`1776`	`1776`	`switch ($addressType) {`
`1777`	`1777`	`case \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_BILLING:`
`1778`	`1778`	`if (is_null($customer->getDefaultBilling())) {`
`1779`		`- $customerAddress->setDefaultBilling(true);`
	`1779`	`+ $customerAddress->setIsDefaultBilling(true);`
`1780`	`1780`	`}`
`1781`	`1781`	`break;`
`1782`	`1782`	`case \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING:`
`1783`	`1783`	`if (is_null($customer->getDefaultShipping())) {`
`1784`		`- $customerAddress->setDefaultShipping(true);`
	`1784`	`+ $customerAddress->setIsDefaultShipping(true);`
`1785`	`1785`	`}`
`1786`	`1786`	`break;`
`1787`	`1787`	`default:`