ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

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

@@ -7,9 +7,8 @@
 
 namespace Magento\Checkout\Model;
 
-use Magento\Quote\Api\Data\AddressInterface;
-
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Quote\Api\Data\AddressInterface;
 
 class AddressComparator implements AddressComparatorInterface
 {
@@ -33,38 +32,36 @@ public function __construct(SerializerInterface $serializer)
      */
     public function isEqual(?AddressInterface $shippingAddress, ?AddressInterface $billingAddress): bool
     {
+        if ($shippingAddress === null || $billingAddress === null) {
+            return false;
+        }
+
         if ($shippingAddress->getCustomerAddressId() !== null &&
             $billingAddress->getCustomerAddressId() !== null
         ) {
-            $sameAsBillingFlag = ((int)$shippingAddress->getCustomerAddressId() ===
+            return ((int)$shippingAddress->getCustomerAddressId() ===
                 (int)$billingAddress->getCustomerAddressId());
         } else {
-            $quoteShippingAddressData = $shippingAddress->getData();
-            $billingAddressData = ($billingAddress !== null) ? $billingAddress->getData() : null;
-            if (!empty($quoteShippingAddressData) && !empty($billingAddressData)) {
-                $billingKeys = array_flip(array_keys($billingAddressData));
-                $shippingData = array_intersect_key($quoteShippingAddressData, $billingKeys);
-                $removeKeys = ['region_code', 'save_in_address_book'];
-                $billingData = array_diff_key($billingAddressData, array_flip($removeKeys));
-                $diff = array_udiff(
-                    $billingData,
-                    $shippingData,
-                    function ($el1, $el2) {
-                        if (is_object($el1)) {
-                            $el1 = $this->serializer->serialize($el1);
-                        }
-                        if (is_object($el2)) {
-                            $el2 = $this->serializer->serialize($el2);
-                        }
-                        return strcmp((string)$el1, (string)$el2);
+            $shippingAddressData = $shippingAddress->getData();
+            $billingAddressData = $billingAddress->getData();
+            $billingKeys = array_flip(array_keys($billingAddressData));
+            $shippingData = array_intersect_key($shippingAddressData, $billingKeys);
+            $removeKeys = ['region_code', 'save_in_address_book'];
+            $billingData = array_diff_key($billingAddressData, array_flip($removeKeys));
+            $diff = array_udiff(
+                $billingData,
+                $shippingData,
+                function ($el1, $el2) {
+                    if (is_object($el1)) {
+                        $el1 = $this->serializer->serialize($el1);
+                    }
+                    if (is_object($el2)) {
+                        $el2 = $this->serializer->serialize($el2);
                     }
-                );
-                $sameAsBillingFlag = empty($diff);
-            } else {
-                $sameAsBillingFlag = false;
-            }
+                    return strcmp((string)$el1, (string)$el2);
+                }
+            );
+            return empty($diff);
         }
-
-        return $sameAsBillingFlag;
     }
 }

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

@@ -247,8 +247,12 @@ private function getLogger()
     private function processShippingIfSameAsBilling(Quote $quote, ?AddressInterface $billingAddress): void
     {
         $shippingAddress = $quote->getShippingAddress();
-        if ((bool)$shippingAddress->getSameAsBilling()
-            || $this->addressComparator->isEqual($shippingAddress, $billingAddress)) {
+        if ($shippingAddress
+            && (
+                (bool)$shippingAddress->getSameAsBilling()
+                || $this->addressComparator->isEqual($shippingAddress, $billingAddress)
+            )
+        ) {
             $shippingAddress->setSameAsBilling(1);
             if ($shippingAddress->getSaveInAddressBook()) {
                 $shippingAddressData = $shippingAddress->exportCustomerAddress();