ACP2E-1117: CustomerAddressId not set for new billing address

pradeep1819 · pradeep1819 · commit 1af5045f3303 · 2022-10-06T12:59:07.000+05:30
diff --git a/app/code/Magento/Checkout/Model/AddressMapper.php b/app/code/Magento/Checkout/Model/AddressMapper.php
@@ -74,7 +74,7 @@ public function customerCheckoutAddressMapper(
             $sameAsBillingFlag = 1;
         } elseif (!empty($quoteShippingAddressData) && !empty($billingAddress)) {
             $sameAsBillingFlag = $quote->getCustomerId() &&
-                    $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);
+                $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);
         } else {
             $sameAsBillingFlag = 0;
         }
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -630,7 +630,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function _prepareCustomerQuote(Quote $quote)
+    protected function _prepareCustomerQuote($quote)
     {
         $billing = $quote->getBillingAddress();
         $shipping = $quote->isVirtual() ? null : $quote->getShippingAddress();

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function customerCheckoutAddressMapper(`
`74`	`74`	`$sameAsBillingFlag = 1;`
`75`	`75`	`} elseif (!empty($quoteShippingAddressData) && !empty($billingAddress)) {`
`76`	`76`	`$sameAsBillingFlag = $quote->getCustomerId() &&`
`77`		`- $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);`
	`77`	`+ $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);`
`78`	`78`	`} else {`
`79`	`79`	`$sameAsBillingFlag = 0;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])`
`630`	`630`	`* @SuppressWarnings(PHPMD.CyclomaticComplexity)`
`631`	`631`	`* @SuppressWarnings(PHPMD.NPathComplexity)`
`632`	`632`	`*/`
`633`		`- protected function _prepareCustomerQuote(Quote $quote)`
	`633`	`+ protected function _prepareCustomerQuote($quote)`
`634`	`634`	`{`
`635`	`635`	`$billing = $quote->getBillingAddress();`
`636`	`636`	`$shipping = $quote->isVirtual() ? null : $quote->getShippingAddress();`