merge magento/2.2-develop into magento-qwerty/PR-2

Author: Magento CICD

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

@@ -1620,6 +1620,9 @@ public function addProduct(
             $item = $this->getItemByProduct($candidate);
             if (!$item) {
                 $item = $this->itemProcessor->init($candidate, $request);
+                $item->setQuote($this);
+                $item->setOptions($candidate->getCustomOptions());
+                $item->setProduct($candidate);
                 // Add only item that is not in quote already
                 $this->addItem($item);
             }

app/code/Magento/Quote/Model/Quote/Item/Processor.php

@@ -71,9 +71,6 @@ public function init(Product $product, $request)
             return $item;
         }
 
-        $item->setOptions($product->getCustomOptions());
-        $item->setProduct($product);
-
         if ($request->getResetCount() && !$product->getStickWithinParent() && $item->getId() === $request->getId()) {
             $item->setData(CartItemInterface::KEY_QTY, 0);
         }

app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php

@@ -142,6 +142,11 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $customerDataFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $itemProcessor;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -223,7 +228,9 @@ protected function setUp()
         $this->filterBuilderMock = $this->getMockBuilder(\Magento\Framework\Api\FilterBuilder::class)
             ->disableOriginalConstructor()
             ->getMock();
-
+        $this->itemProcessor = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item\Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->extensionAttributesJoinProcessorMock = $this->createMock(\Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class);
         $this->customerDataFactoryMock = $this->createPartialMock(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class, ['create']);
         $this->quote = (new ObjectManager($this))
@@ -249,6 +256,7 @@ protected function setUp()
                     'objectCopyService' => $this->objectCopyServiceMock,
                     'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
                     'customerDataFactory' => $this->customerDataFactoryMock,
+                    'itemProcessor' => $this->itemProcessor,
                     'data' => [
                         'reserved_order_id' => 1000001
                     ]
@@ -853,6 +861,69 @@ public function testAddProductItemPreparation()
         $this->assertEquals($expectedResult, $result);
     }
 
+    public function testAddProductItemNew()
+    {
+        $itemMock = $this->createMock(\Magento\Quote\Model\Quote\Item::class);
+
+        $expectedResult = $itemMock;
+        $requestMock = $this->createMock(
+            \Magento\Framework\DataObject::class
+        );
+        $this->objectFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($this->equalTo(['qty' => 1]))
+            ->will($this->returnValue($requestMock));
+
+        $typeInstanceMock = $this->createPartialMock(\Magento\Catalog\Model\Product\Type\Simple::class, [
+            'prepareForCartAdvanced'
+        ]);
+
+        $productMock = $this->createPartialMock(\Magento\Catalog\Model\Product::class, [
+            'getParentProductId',
+            'setStickWithinParent',
+            '__wakeup'
+        ]);
+
+        $collectionMock = $this->createMock(\Magento\Quote\Model\ResourceModel\Quote\Item\Collection::class);
+
+        $itemMock->expects($this->any())
+            ->method('representProduct')
+            ->will($this->returnValue(false));
+
+        $iterator = new \ArrayIterator([$itemMock]);
+        $collectionMock->expects($this->any())
+            ->method('getIterator')
+            ->will($this->returnValue($iterator));
+
+        $this->quoteItemCollectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($collectionMock));
+
+        $this->productMock->expects($this->once())
+            ->method('isSalable')
+            ->willReturn(true);
+        $this->itemProcessor
+            ->expects($this->once())
+            ->method('init')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('setProduct');
+        $itemMock->expects($this->once())
+            ->method('setOptions');
+        $itemMock->expects($this->any())
+            ->method('setQuote')
+            ->with($this->quote);
+        $typeInstanceMock->expects($this->once())
+            ->method('prepareForCartAdvanced')
+            ->will($this->returnValue([$productMock]));
+        $this->productMock->expects($this->once())
+            ->method('getTypeInstance')
+            ->will($this->returnValue($typeInstanceMock));
+
+        $result = $this->quote->addProduct($this->productMock, null);
+        $this->assertEquals($expectedResult, $result);
+    }
+
     public function testValidateMiniumumAmount()
     {
         $storeId = 1;

app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php

@@ -154,7 +154,7 @@ protected function _processActionData($action = null)
         $this->_eventManager->dispatch('adminhtml_sales_order_create_process_data_before', $eventData);
 
         /**
-         * Saving order data
+         * Import post data, in order to make order quote valid
          */
         if ($data = $this->getRequest()->getPost('order')) {
             $this->_getOrderCreateModel()->importPostData($data);
@@ -210,6 +210,8 @@ protected function _processActionData($action = null)
             $this->_getOrderCreateModel()->applySidebarData($data);
         }
 
+        $this->_eventManager->dispatch('adminhtml_sales_order_create_process_item_before', $eventData);
+
         /**
          * Adding product to quote from shopping cart, wishlist etc.
          */
@@ -256,6 +258,8 @@ protected function _processActionData($action = null)
             $this->_getOrderCreateModel()->moveQuoteItem($moveItemId, $moveTo, $moveQty);
         }
 
+        $this->_eventManager->dispatch('adminhtml_sales_order_create_process_item_after', $eventData);
+
         if ($paymentData = $this->getRequest()->getPost('payment')) {
             $this->_getOrderCreateModel()->getQuote()->getPayment()->addData($paymentData);
         }