ACP2E-1117: CustomerAddressId not set for new billing address

pradeep1819 · pradeep1819 · commit fc35ac4dbde4 · 2022-09-30T13:58:46.000+05:30
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -674,7 +674,10 @@ protected function _prepareCustomerQuote(Quote $quote)
         }
 
         if ((!$billing->getCustomerId() || $billing->getSaveInAddressBook())
-            && ($shipping && (!$shipping->getSameAsBilling() || !$shipping->getCustomerAddressId()))) {
+            && (
+                $shipping === null
+                || ($shipping && (!$shipping->getSameAsBilling() || !$shipping->getCustomerAddressId()))
+            )) {
             if ($billing->getQuoteId()) {
                 $billingAddress = $billing->exportCustomerAddress();
             } else {
@@ -705,14 +708,14 @@ protected function _prepareCustomerQuote(Quote $quote)
                 $billing->setCustomerAddressId($billingAddress->getId());
 
                 // Admin order: `Same As Billing Address`- when new billing address saved in address book
-                if (!empty($shipping)
+                if ($shipping !== null
                     && !$shipping->getCustomerAddressId()
                     && $shipping->getSameAsBilling()) {
                     $shipping->setCustomerAddressId($billingAddress->getId());
                 }
             }
         }
-        if (!empty($shipping) && $shipping->getSameAsBilling() && !$billing->getCustomerAddressId()) {
+        if ($shipping !== null && $shipping->getSameAsBilling() && !$billing->getCustomerAddressId()) {
             $billing->setCustomerAddressId($shipping->getCustomerAddressId());
         }
         if ($shipping && !$shipping->getCustomerId() && !$hasDefaultBilling) {

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,10 @@ protected function _prepareCustomerQuote(Quote $quote)`
`674`	`674`	`}`
`675`	`675`
`676`	`676`	`if ((!$billing->getCustomerId() \|\| $billing->getSaveInAddressBook())`
`677`		`- && ($shipping && (!$shipping->getSameAsBilling() \|\| !$shipping->getCustomerAddressId()))) {`
	`677`	`+ && (`
	`678`	`+ $shipping === null`
	`679`	`+ \|\| ($shipping && (!$shipping->getSameAsBilling() \|\| !$shipping->getCustomerAddressId()))`
	`680`	`+ )) {`
`678`	`681`	`if ($billing->getQuoteId()) {`
`679`	`682`	`$billingAddress = $billing->exportCustomerAddress();`
`680`	`683`	`} else {`
`@@ -705,14 +708,14 @@ protected function _prepareCustomerQuote(Quote $quote)`
`705`	`708`	`$billing->setCustomerAddressId($billingAddress->getId());`
`706`	`709`
`707`	`710`	// Admin order: `Same As Billing Address`- when new billing address saved in address book
`708`		`- if (!empty($shipping)`
	`711`	`+ if ($shipping !== null`
`709`	`712`	`&& !$shipping->getCustomerAddressId()`
`710`	`713`	`&& $shipping->getSameAsBilling()) {`
`711`	`714`	`$shipping->setCustomerAddressId($billingAddress->getId());`
`712`	`715`	`}`
`713`	`716`	`}`
`714`	`717`	`}`
`715`		`- if (!empty($shipping) && $shipping->getSameAsBilling() && !$billing->getCustomerAddressId()) {`
	`718`	`+ if ($shipping !== null && $shipping->getSameAsBilling() && !$billing->getCustomerAddressId()) {`
`716`	`719`	`$billing->setCustomerAddressId($shipping->getCustomerAddressId());`
`717`	`720`	`}`
`718`	`721`	`if ($shipping && !$shipping->getCustomerId() && !$hasDefaultBilling) {`