MAGETWO-53464: Reorder not load products

Author: Stanislav Idolov

app/code/Magento/Backend/Model/Session/Quote.php

@@ -150,15 +150,16 @@ public function __construct(
      */
     public function getQuote()
     {
-        $cartManagement = $this->getCartManagement();
-
         if ($this->_quote === null) {
+            $this->_quote = $this->quoteFactory->create();
             if ($this->getStoreId()) {
                 if (!$this->getQuoteId()) {
-                    $this->setQuoteId($cartManagement->createEmptyCart());
-                    $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
                     $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
-                    $this->_quote->setIsActive(false);
+                    $this->_quote->setStoreId($this->getStoreId());
+
+                    $this->quoteRepository->save($this->_quote);
+                    $this->setQuoteId($this->_quote->getId());
+                    $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
                 } else {
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
                     $this->_quote->setStoreId($this->getStoreId());
@@ -167,6 +168,7 @@ public function getQuote()
                 if ($this->getCustomerId() && $this->getCustomerId() != $this->_quote->getCustomerId()) {
                     $customer = $this->customerRepository->getById($this->getCustomerId());
                     $this->_quote->assignCustomer($customer);
+                    $this->quoteRepository->save($this->_quote);
                 }
             }
             $this->_quote->setIgnoreOldQty(true);
@@ -176,18 +178,6 @@ public function getQuote()
         return $this->_quote;
     }
 
-    /**
-     * @return CartManagementInterface
-     * @deprecated
-     */
-    private function getCartManagement()
-    {
-        if ($this->cartManagement === null) {
-            $this->cartManagement = ObjectManager::getInstance()->get(CartManagementInterface::class);
-        }
-        return $this->cartManagement;
-    }
-
     /**
      * Retrieve store model object
      *

app/code/Magento/Quote/Model/Quote/Address.php

@@ -564,8 +564,7 @@ public function getItemsCollection()
     public function getAllItems()
     {
         // We calculate item list once and cache it in three arrays - all items
-        $cachedItems = 'all';
-        $key = 'cached_items_' . $cachedItems;
+        $key = 'cached_items_all';
         if (!$this->hasData($key)) {
             $quoteItems = $this->getQuote()->getItemsCollection();
             $addressItems = $this->getItemsCollection();

app/code/Magento/Quote/Model/QuoteRepository.php

@@ -150,13 +150,12 @@ public function save(\Magento\Quote\Api\Data\CartInterface $quote)
     {
         if ($quote->getId()) {
             $currentQuote = $this->get($quote->getId(), [$quote->getStoreId()]);
-            $currentQuote->setStoreId($quote->getStoreId());
-            // This part has to be refactored
-            if ($quote->getBillingAddress()) {
-                $currentQuote->setBillingAddress($quote->getBillingAddress());
+
+            foreach ($currentQuote->getData() as $key => $value) {
+                if ($quote->getData($key) === null) {
+                    $quote->setData($key, $value);
+                }
             }
-            $currentQuote->addData($quote->getData());
-            $quote = $currentQuote;
         }
 
         $this->getSaveHandler()->save($quote);

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

@@ -552,6 +552,9 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
             $this->collectRates();
         }
 
+        $quote->getShippingAddress()->unsCachedItemsAll();
+        $quote->setTotalsCollectedFlag(false);
+
         $this->quoteRepository->save($quote);
 
         return $this;