Added logic to correctly add items to wishlist/cart from an [items ordered] section when creating an order from admin

Author: rostilos

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -816,6 +816,7 @@ public function getCustomerGroupId()
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     public function moveQuoteItem($item, $moveTo, $qty)
     {
@@ -875,11 +876,15 @@ public function moveQuoteItem($item, $moveTo, $qty)
                             );
                         }
 
-                        $cartItem = $cart->addProduct($product, $info);
-                        if (is_string($cartItem)) {
-                            throw new \Magento\Framework\Exception\LocalizedException(__($cartItem));
+                        $cartItems = $cart->getAllVisibleItems();
+                        $canBeRestored = (bool)$this->restoreTransferredItems('cart', $cartItems, $product);
+                        if (!$canBeRestored) {
+                            $cartItem = $cart->addProduct($product, $info);
+                            if (is_string($cartItem)) {
+                                throw new \Magento\Framework\Exception\LocalizedException(__($cartItem));
+                            }
+                            $cartItem->setPrice($item->getProduct()->getPrice());
                         }
-                        $cartItem->setPrice($item->getProduct()->getPrice());
                         $this->_needCollectCart = true;
                         $removeItem = true;
                     }
@@ -922,7 +927,11 @@ public function moveQuoteItem($item, $moveTo, $qty)
                         )->setStoreId(
                             $this->getSession()->getStoreId()
                         );
-                        $wishlist->addNewItem($item->getProduct(), $info);
+                        $wishlistItems = $wishlist->getItemCollection()->getItems();
+                        $canBeRestored = (bool)$this->restoreTransferredItems('wishlist', $wishlistItems, null);
+                        if (!$canBeRestored) {
+                            $wishlist->addNewItem($item->getProduct(), $info);
+                        }
                         $removeItem = true;
                     }
                     break;
@@ -969,7 +978,7 @@ public function applySidebarData($data)
                 if ($item) {
                     $this->moveQuoteItem($item, 'order', $qty);
                     $transferredItems = $this->_session->getTransferredItems() ?? [];
-                    $transferredItems['cart'][] = $itemId;
+                    $transferredItems['cart'][$itemId] = $itemId;
                     $this->_session->setTransferredItems($transferredItems) ;
                 }
             }
@@ -985,7 +994,7 @@ public function applySidebarData($data)
                 if ($item->getId()) {
                     $this->addProduct($item->getProduct(), $item->getBuyRequest()->toArray());
                     $transferredItems = $this->_session->getTransferredItems() ?? [];
-                    $transferredItems['wishlist'][] = $itemId;
+                    $transferredItems['wishlist'][$itemId] = $itemId;
                     $this->_session->setTransferredItems($transferredItems) ;
                 }
             }
@@ -2051,6 +2060,43 @@ private function removeTransferredItems(): void
         }
     }
 
+    /**
+     * Restore items that were transferred from their original sources (cart, wishlist, ...) into ordered items
+     *
+     * @param string $area
+     * @param \Magento\Quote\Model\Quote\Item[]|\Magento\Wishlist\Model\Item[] $items
+     * @param \Magento\Catalog\Model\Product|null $product Product
+     * @return bool
+     */
+    private function restoreTransferredItems($area, $items, $product = null): bool
+    {
+        $transferredItems = $this->_session->getTransferredItems() ?? [];
+        switch ($area) {
+            case 'wishlist':
+                $transferredFromWishlist = array_intersect_key($items, $transferredItems['wishlist']);
+                if ($transferredFromWishlist) {
+                    $wishlistItemId = array_key_first($transferredFromWishlist);
+                    unset($transferredItems['wishlist'][$wishlistItemId]);
+                    $this->_session->setTransferredItems($transferredItems);
+                    return true;
+                }
+                break;
+            case 'cart':
+                $cart = $this->getCustomerCart();
+                $cartItem = $cart->getItemByProduct($product);
+                $transferredFromCart = $cartItem ? in_array($cartItem->getId(), $transferredItems['cart']) : false;
+                if ($transferredFromCart) {
+                    unset($transferredItems['cart'][$cartItem->getItemId()]);
+                    $this->_session->setTransferredItems($transferredItems);
+                    return true;
+                }
+                break;
+            default:
+                break;
+        }
+        return false;
+    }
+
     /**
      * Validate quote data before order creation
      *