ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

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

@@ -9,8 +9,25 @@
 
 use Magento\Quote\Api\Data\AddressInterface;
 
+use Magento\Framework\Serialize\SerializerInterface;
+
 class AddressComparator implements AddressComparatorInterface
 {
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * AddressComparator constructor
+     *
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(SerializerInterface $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
     /**
      * @inheritDoc
      */

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

@@ -97,6 +97,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      * @param AddressRepositoryInterface|null $addressRepository
      * @param AddressComparatorInterface|null $addressComparator
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement,
@@ -165,7 +166,9 @@ public function savePaymentInformationAndPlaceOrder(
 
     /**
      * @inheritdoc
+     *
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function savePaymentInformation(
         $cartId,
@@ -194,15 +197,16 @@ public function savePaymentInformation(
             $quote->setBillingAddress($billingAddress);
             $quote->setDataChanges(true);
             $shippingAddress = $quote->getShippingAddress();
-            $sameAsBilling = (bool)$shippingAddress->getSameAsBilling()
-                || $this->addressComparator->isEqual($shippingAddress, $billingAddress);
-            if ($sameAsBilling) {
-                $this->saveNewShippingAddress($quote);
-            }
-            if ($shippingAddress && $shippingAddress->getShippingMethod()) {
-                $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-                if ($shippingRate) {
-                    $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+            if ($shippingAddress) {
+                if ((bool)$shippingAddress->getSameAsBilling()
+                    || $this->addressComparator->isEqual($shippingAddress, $billingAddress)) {
+                    $this->saveNewShippingAddress($quote);
+                }
+                if ($shippingAddress->getShippingMethod()) {
+                    $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
+                    if ($shippingRate) {
+                        $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+                    }
                 }
             }
         }
@@ -241,9 +245,10 @@ private function getLogger()
      * Save shipping address information
      *
      * @param Quote $quote
+     * @return void
      * @throws LocalizedException
      */
-    private function saveNewShippingAddress(Quote $quote)
+    private function saveNewShippingAddress(Quote $quote): void
     {
         $quote->getShippingAddress()->setSameAsBilling(1);
         $shippingAddressData = $quote->getShippingAddress()->exportCustomerAddress();