Merge remote-tracking branch 'magento-l3/ACP2E-2620' into Tier4-Kings-PR-03-05-2024

Author: glanujnehra

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

@@ -11,6 +11,7 @@
 use Magento\Customer\Model\Metadata\Form as CustomerForm;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\CustomAttributeListInterface;
 use Magento\Quote\Model\Quote\Item;
@@ -20,6 +21,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 use Magento\Quote\Model\Quote;
+use Magento\Framework\App\Request\Http as HttpRequest;
 
 /**
  * Order create model
@@ -264,6 +266,11 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      */
     private $orderRepositoryInterface;
 
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -298,6 +305,7 @@ class Create extends \Magento\Framework\DataObject implements \Magento\Checkout\
      * @param StoreManagerInterface $storeManager
      * @param CustomAttributeListInterface|null $customAttributeList
      * @param OrderRepositoryInterface|null $orderRepositoryInterface
+     * @param HttpRequest|null $request
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -333,7 +341,8 @@ public function __construct(
         ExtensibleDataObjectConverter $dataObjectConverter = null,
         StoreManagerInterface $storeManager = null,
         CustomAttributeListInterface $customAttributeList = null,
-        OrderRepositoryInterface $orderRepositoryInterface = null
+        OrderRepositoryInterface $orderRepositoryInterface = null,
+        HttpRequest $request = null
     ) {
         $this->_objectManager = $objectManager;
         $this->_eventManager = $eventManager;
@@ -372,6 +381,8 @@ public function __construct(
             ->get(CustomAttributeListInterface::class);
         $this->orderRepositoryInterface = $orderRepositoryInterface ?: ObjectManager::getInstance()
             ->get(OrderRepositoryInterface::class);
+        $this->request = $request ?: ObjectManager::getInstance()
+            ->get(HttpRequest::class);
     }
 
     /**
@@ -895,15 +906,16 @@ public function moveQuoteItem($item, $moveTo, $qty)
                         }
                         $canBeRestored = $this->restoreTransferredItem('cart', $cartItemsToRestore);
 
+                        $cartItem = $cart->addProduct($product, $info);
                         if (!$canBeRestored) {
-                            $cartItem = $cart->addProduct($product, $info);
                             if (is_string($cartItem)) {
                                 throw new \Magento\Framework\Exception\LocalizedException(__($cartItem));
                             }
                             $cartItem->setPrice($item->getProduct()->getPrice());
                         }
                         $this->_needCollectCart = true;
                         $removeItem = true;
+                        $this->removeCartTransferredItemsAndUpdateQty($cartItem, $item->getId());
                     }
                     break;
                 case 'wishlist':
@@ -2310,4 +2322,33 @@ private function formattedOptions(\Magento\Catalog\Model\Product $product, $buyR
         }
         return $this;
     }
+
+    /**
+     * Remove cart from transferred items and update the qty.
+     *
+     * @param int|null|Item $cartItem
+     * @param int $itemId
+     * @return void
+     */
+    private function removeCartTransferredItemsAndUpdateQty(int|null|Item $cartItem, int $itemId)
+    {
+        $removeCartTransferredItems = $this->getSession()->getTransferredItems() ?? [];
+        if (isset($removeCartTransferredItems['cart'])) {
+            $removeTransferredItemKey = array_search($cartItem->getId(), $removeCartTransferredItems['cart']);
+            if ($removeCartTransferredItems['cart'][$removeTransferredItemKey]) {
+                $cartItem->clearMessage();
+                $cartItem->setHasError(false);
+                if (isset($this->request->get('item')[$itemId]['qty'])) {
+                    $qty = $this->request->get('item')[$itemId]['qty'];
+                    $cartItem->setQty($qty);
+                }
+
+                if ($cartItem->getHasError()) {
+                    throw new LocalizedException(__($cartItem->getMessage()));
+                }
+                unset($removeCartTransferredItems['cart'][$removeTransferredItemKey]);
+            }
+            $this->getSession()->setTransferredItems($removeCartTransferredItems);
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -699,6 +699,7 @@ public function testMoveQuoteItemToCart()
         /** @var SessionQuote $session */
         $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($fixtureCustomerId);
+        $session->setTransferredItems(['cart' => [124]]);
         /** @var $quoteFixture Quote */
         $quoteFixture = $this->objectManager->create(Quote::class);
         $quoteFixture->load('test01', 'reserved_order_id');
@@ -710,6 +711,7 @@ public function testMoveQuoteItemToCart()
         $this->model->moveQuoteItem($item, 'cart', 3);
         self::assertEquals(4, $item->getQty(), 'Number of Qty isn\'t correct for Quote item.');
         self::assertEquals(3, $item->getQtyToAdd(), 'Number of added qty isn\'t correct for Quote item.');
+        self::assertEquals($session->getTransferredItems(), ['cart' => []]);
     }
 
     /**