ACP2E-1117: CustomerAddressId not set for new billing address

Author: pradeep1819

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

@@ -46,16 +46,16 @@ public function isEqual(?AddressInterface $shippingAddress, ?AddressInterface $b
             $billingAddressData = $billingAddress->getData();
             $billingKeys = array_flip(array_keys($billingAddressData));
             $shippingData = array_intersect_key($shippingAddressData, $billingKeys);
-            $removeKeys = ['region_code', 'save_in_address_book'];
+            $removeKeys = ['address_type', '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)) {
+                    if (is_object($el1) || is_array($el1)) {
                         $el1 = $this->serializer->serialize($el1);
                     }
-                    if (is_object($el2)) {
+                    if (is_object($el2) || is_array($el2)) {
                         $el2 = $this->serializer->serialize($el2);
                     }
                     return strcmp((string)$el1, (string)$el2);

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

@@ -14,8 +14,8 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote;
+use Psr\Log\LoggerInterface;
 
 /**
  * Payment information management service.
@@ -51,11 +51,6 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      */
     protected $cartTotalsRepository;
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
-
     /**
      * @var CartRepositoryInterface
      */
@@ -86,6 +81,11 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      */
     private $addressComparator;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
@@ -97,6 +97,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      * @param CartRepositoryInterface|null $cartRepository
      * @param AddressRepositoryInterface|null $addressRepository
      * @param AddressComparatorInterface|null $addressComparator
+     * @param LoggerInterface|null $logger
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -110,7 +111,8 @@ public function __construct(
         ?PaymentSavingRateLimiterInterface $saveRateLimiter = null,
         ?CartRepositoryInterface $cartRepository = null,
         ?AddressRepositoryInterface $addressRepository = null,
-        ?AddressComparatorInterface $addressComparator = null
+        ?AddressComparatorInterface $addressComparator = null,
+        ?LoggerInterface $logger = null
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
@@ -127,6 +129,7 @@ public function __construct(
             ?? ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
         $this->addressComparator = $addressComparator
             ?? ObjectManager::getInstance()->get(AddressComparatorInterface::class);
+        $this->logger = $logger ?? ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -148,15 +151,15 @@ public function savePaymentInformationAndPlaceOrder(
         try {
             $orderId = $this->cartManagement->placeOrder($cartId);
         } catch (LocalizedException $e) {
-            $this->getLogger()->critical(
+            $this->logger->critical(
                 'Placing an order with quote_id ' . $cartId . ' is failed: ' . $e->getMessage()
             );
             throw new CouldNotSaveException(
                 __($e->getMessage()),
                 $e
             );
         } catch (\Exception $e) {
-            $this->getLogger()->critical($e);
+            $this->logger->critical($e);
             throw new CouldNotSaveException(
                 __('A server error stopped your order from being placed. Please try to place your order again.'),
                 $e
@@ -196,13 +199,8 @@ public function savePaymentInformation(
             $quote->removeAddress($quote->getBillingAddress()->getId());
             $quote->setBillingAddress($billingAddress);
             $quote->setDataChanges(true);
-            $this->processShippingIfSameAsBilling($quote, $billingAddress);
-            $shippingAddress = $quote->getShippingAddress();
-            if ($shippingAddress && $shippingAddress->getShippingMethod()) {
-                $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
-                if ($shippingRate) {
-                    $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
-                }
+            if ($quote->getShippingAddress()) {
+                $this->processShippingAddress($quote);
             }
         }
         $this->paymentMethodManagement->set($cartId, $paymentMethod);
@@ -222,57 +220,44 @@ public function getPaymentInformation($cartId)
     }
 
     /**
-     * Get logger instance
-     *
-     * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.1.8
-     * @see not in use anymore
-     */
-    private function getLogger()
-    {
-        if (!$this->logger) {
-            $this->logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
-        }
-        return $this->logger;
-    }
-
-    /**
-     * Save shipping address information
+     * Processes shipping address.
      *
      * @param Quote $quote
-     * @param AddressInterface|null $billingAddress
      * @return void
      * @throws LocalizedException
      */
-    private function processShippingIfSameAsBilling(Quote $quote, ?AddressInterface $billingAddress): void
+    private function processShippingAddress(Quote $quote): void
     {
         $shippingAddress = $quote->getShippingAddress();
-        if ($shippingAddress
-            && (
-                (bool)$shippingAddress->getSameAsBilling()
-                || $this->addressComparator->isEqual($shippingAddress, $billingAddress)
-            )
-        ) {
+        $billingAddress = $quote->getBillingAddress();
+        if ($shippingAddress->getShippingMethod()) {
+            $shippingRate = $shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod());
+            if ($shippingRate) {
+                $shippingAddress->setLimitCarrier($shippingRate->getCarrier());
+            }
+        }
+        if ($this->addressComparator->isEqual($shippingAddress, $billingAddress)) {
             $shippingAddress->setSameAsBilling(1);
-            if ($shippingAddress->getSaveInAddressBook()) {
-                $shippingAddressData = $shippingAddress->exportCustomerAddress();
-                $customer = $quote->getCustomer();
-                $hasDefaultBilling = (bool)$customer->getDefaultBilling();
-                $hasDefaultShipping = (bool)$customer->getDefaultShipping();
-                if (!$hasDefaultShipping) {
-                    //Make provided address as default shipping address
-                    $shippingAddressData->setIsDefaultShipping(true);
-                    if (!$hasDefaultBilling && !$quote->getBillingAddress()->getSaveInAddressBook()) {
-                        $shippingAddressData->setIsDefaultBilling(true);
-                    }
+        }
+        // Save new address in the customer address book and set it id for billing and shipping quote addresses.
+        if ($shippingAddress->getSameAsBilling() && $shippingAddress->getSaveInAddressBook()) {
+            $shippingAddressData = $shippingAddress->exportCustomerAddress();
+            $customer = $quote->getCustomer();
+            $hasDefaultBilling = (bool)$customer->getDefaultBilling();
+            $hasDefaultShipping = (bool)$customer->getDefaultShipping();
+            if (!$hasDefaultShipping) {
+                //Make provided address as default shipping address
+                $shippingAddressData->setIsDefaultShipping(true);
+                if (!$hasDefaultBilling && !$billingAddress->getSaveInAddressBook()) {
+                    $shippingAddressData->setIsDefaultBilling(true);
                 }
-                $shippingAddressData->setCustomerId($quote->getCustomerId());
-                $this->addressRepository->save($shippingAddressData);
-                $quote->addCustomerAddress($shippingAddressData);
-                $shippingAddress->setCustomerAddressData($shippingAddressData);
-                $shippingAddress->setCustomerAddressId($shippingAddressData->getId());
-                $quote->getBillingAddress()->setCustomerAddressId($shippingAddressData->getId());
             }
+            $shippingAddressData->setCustomerId($quote->getCustomerId());
+            $this->addressRepository->save($shippingAddressData);
+            $quote->addCustomerAddress($shippingAddressData);
+            $shippingAddress->setCustomerAddressData($shippingAddressData);
+            $shippingAddress->setCustomerAddressId($shippingAddressData->getId());
+            $billingAddress->setCustomerAddressId($shippingAddressData->getId());
         }
     }
 }