MC-19105: One item purchased turns into two items on reorder (Multi-shipping)

Author: yelahin-serhiy

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -23,6 +23,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Multishipping extends \Magento\Framework\DataObject
@@ -526,6 +527,7 @@ protected function _addShippingItem($quoteItemId, $data)
             $quoteItem->setQty($quoteItem->getMultishippingQty());
             try {
                 $address = $this->addressRepository->getById($addressId);
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
             } catch (\Exception $e) {
             }
             if (isset($address)) {
@@ -565,6 +567,7 @@ public function updateQuoteCustomerShippingAddress($addressId)
         }
         try {
             $address = $this->addressRepository->getById($addressId);
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Exception $e) {
             //
         }
@@ -592,6 +595,7 @@ public function setQuoteCustomerBillingAddress($addressId)
         }
         try {
             $address = $this->addressRepository->getById($addressId);
+        // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
         } catch (\Exception $e) {
             //
         }
@@ -825,7 +829,7 @@ public function createOrders()
                 if ($order->getCanSendNewEmailFlag()) {
                     $this->orderSender->send($order);
                 }
-                $placedAddressItems = array_merge($placedAddressItems, $this->getQuoteAddressItems($order));
+                $placedAddressItems = $this->getPlacedAddressItems($order);
             }
 
             $addressErrors = [];
@@ -1090,10 +1094,14 @@ public function getCustomer()
      */
     protected function isAddressIdApplicable($addressId)
     {
-        $applicableAddressIds = array_map(function ($address) {
-            /** @var \Magento\Customer\Api\Data\AddressInterface $address */
-            return $address->getId();
-        }, $this->getCustomer()->getAddresses());
+        $applicableAddressIds = array_map(
+            function ($address) {
+                /** @var \Magento\Customer\Api\Data\AddressInterface $address */
+                return $address->getId();
+            },
+            $this->getCustomer()->getAddresses()
+        );
+
         return !is_numeric($addressId) || in_array($addressId, $applicableAddressIds);
     }
 
@@ -1279,4 +1287,20 @@ private function getQuoteAddressItems(OrderInterface $order): array
 
         return $placedAddressItems;
     }
+
+    /**
+     * Returns placed address items
+     *
+     * @param OrderInterface $order
+     * @return array
+     */
+    private function getPlacedAddressItems(OrderInterface $order): array
+    {
+        $placedAddressItems = [];
+        foreach ($this->getQuoteAddressItems($order) as $key => $quoteAddressItem) {
+            $placedAddressItems[$key] = $quoteAddressItem;
+        }
+
+        return $placedAddressItems;
+    }
 }