Merge remote-tracking branch 'origin/ACP2E-3646' into PR_2025_04_28

Author: katmoon

app/code/Magento/Multishipping/Model/Cart/MultishippingClearItemAddress.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -86,16 +86,8 @@ public function clearAddressItem($subject, $request)
         $isMultipleShippingAddressesPresent = $quote->isMultipleShippingAddresses();
         if ($isMultipleShippingAddressesPresent || $this->isDisableMultishippingRequired($request, $quote)) {
             $this->disableMultishipping->execute($quote);
-            foreach ($quote->getAllShippingAddresses() as $address) {
-                $quote->removeAddress($address->getId());
-            }
+            $this->setDefaultShippingAddress($quote);
 
-            $shippingAddress = $quote->getShippingAddress();
-            $defaultShipping = $quote->getCustomer()->getDefaultShipping();
-            if ($defaultShipping) {
-                $defaultCustomerAddress = $this->addressRepository->getById($defaultShipping);
-                $shippingAddress->importCustomerAddressData($defaultCustomerAddress);
-            }
             if ($isMultipleShippingAddressesPresent) {
                 $this->checkoutSession->setMultiShippingAddressesFlag(true);
             }
@@ -111,6 +103,35 @@ public function clearAddressItem($subject, $request)
         }
     }
 
+    /**
+     * Determine shipping address from current multi-shipping configuration
+     *
+     * @param Quote $quote
+     * @return void
+     * @throws LocalizedException
+     */
+    private function setDefaultShippingAddress(Quote $quote): void
+    {
+        $currentShippingAddress = $quote->getShippingAddress();
+        foreach ($quote->getAllShippingAddresses() as $address) {
+            if ($address->getId() === $currentShippingAddress->getId()) {
+                continue;
+            }
+            $quote->removeAddress($address->getId());
+        }
+
+        if ($currentShippingAddress) {
+            $quote->addShippingAddress($currentShippingAddress);
+        } else {
+            $shippingAddress = $quote->getShippingAddress();
+            $defaultShipping = $quote->getCustomer()->getDefaultShipping();
+            if ($defaultShipping) {
+                $defaultCustomerAddress = $this->addressRepository->getById($defaultShipping);
+                $shippingAddress->importCustomerAddressData($defaultCustomerAddress);
+            }
+        }
+    }
+
     /**
      * Checks whether quote has virtual items
      *