Merge remote-tracking branch 'mainline/2.2-develop' into 2.2-develop-prs

Author: Oleksii Korshenko

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

@@ -412,17 +412,24 @@ public function submit(QuoteEntity $quote, $orderData = [])
      */
     protected function resolveItems(QuoteEntity $quote)
     {
-        $quoteItems = [];
-        foreach ($quote->getAllItems() as $quoteItem) {
-            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $quoteItem */
-            $quoteItems[$quoteItem->getId()] = $quoteItem;
-        }
         $orderItems = [];
-        foreach ($quoteItems as $quoteItem) {
-            $parentItem = (isset($orderItems[$quoteItem->getParentItemId()])) ?
-                $orderItems[$quoteItem->getParentItemId()] : null;
-            $orderItems[$quoteItem->getId()] =
-                $this->quoteItemToOrderItem->convert($quoteItem, ['parent_item' => $parentItem]);
+        foreach ($quote->getAllItems() as $quoteItem) {
+            $itemId = $quoteItem->getId();
+
+            if (!empty($orderItems[$itemId])) {
+                continue;
+            }
+
+            $parentItemId = $quoteItem->getParentItemId();
+            /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $parentItem */
+            if ($parentItemId && !isset($orderItems[$parentItemId])) {
+                $orderItems[$parentItemId] = $this->quoteItemToOrderItem->convert(
+                    $quoteItem->getParentItem(),
+                    ['parent_item' => null]
+                );
+            }
+            $parentItem = isset($orderItems[$parentItemId]) ? $orderItems[$parentItemId] : null;
+            $orderItems[$itemId] = $this->quoteItemToOrderItem->convert($quoteItem, ['parent_item' => $parentItem]);
         }
         return array_values($orderItems);
     }

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -147,6 +147,21 @@ public function resetJoinQuotes($quotesTableName, $productId = null)
         return $this;
     }
 
+    /**
+     * Join product entities to select existing products items only
+     *
+     * @return void
+     */
+    protected function _beforeLoad()
+    {
+        parent::_beforeLoad();
+        $this->join(
+            ['cpe' => $this->getResource()->getTable('catalog_product_entity')],
+            "cpe.entity_id = main_table.product_id",
+            []
+        );
+    }
+
     /**
      * After load processing
      *