ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

app/code/Magento/Checkout/Model/AddressMapper.php

@@ -64,15 +64,19 @@ public function customerCheckoutAddressMapper(
         $quote = $this->cartRepository->getActive($cartId);
         $shippingAddress = $quote->getShippingAddress();
         $quoteShippingAddressData = $shippingAddress->getData();
-        $sameAsBillingFlag = (int)$shippingAddress->getSameAsBilling();
+        $quoteSameAsBilling = (int)$shippingAddress->getSameAsBilling();
         $customer = $quote->getCustomer();
         $customerId = $customer->getId();
         $hasDefaultBilling = $customer->getDefaultBilling();
         $hasDefaultShipping = $customer->getDefaultShipping();
 
-        if ($sameAsBillingFlag !== 1 && !empty($quoteShippingAddressData) && !empty($billingAddress)) {
+        if ($quoteSameAsBilling === 1) {
+            $sameAsBillingFlag = 1;
+        } elseif (!empty($quoteShippingAddressData) && !empty($billingAddress)) {
             $sameAsBillingFlag = $quote->getCustomerId() &&
-                $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);
+                    $this->checkIfShippingAddressMatchesWithBillingAddress($shippingAddress, $billingAddress);
+        } else {
+            $sameAsBillingFlag = 0;
         }
 
         if ($sameAsBillingFlag) {