Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr11

Author: zakdma

app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -180,19 +180,28 @@ public function providerForGetterTierPriceList()
     /**
      * @dataProvider providerForTestGetSavePercent
      */
-    public function testGetSavePercent($baseAmount, $savePercent)
+    public function testGetSavePercent($baseAmount, $tierPrice, $savePercent)
     {
-        $basePrice = 10.;
+        /** @var \Magento\Framework\Pricing\Amount\AmountInterface|\PHPUnit_Framework_MockObject_MockObject $amount */
         $amount = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Amount\AmountInterface::class);
-        $amount->expects($this->once())->method('getBaseAmount')->willReturn($baseAmount);
+        $amount->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue($tierPrice));
+
+        $priceAmount = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Amount\AmountInterface::class);
+        $priceAmount->expects($this->any())
+            ->method('getValue')
+            ->will($this->returnValue($baseAmount));
+
         $price = $this->createMock(\Magento\Framework\Pricing\Price\PriceInterface::class);
         $price->expects($this->any())
-            ->method('getValue')
-            ->will($this->returnValue($basePrice));
+            ->method('getAmount')
+            ->will($this->returnValue($priceAmount));
 
         $this->priceInfo->expects($this->any())
             ->method('getPrice')
             ->will($this->returnValue($price));
+
         $this->assertEquals($savePercent, $this->model->getSavePercent($amount));
     }
 
@@ -202,8 +211,8 @@ public function testGetSavePercent($baseAmount, $savePercent)
     public function providerForTestGetSavePercent()
     {
         return [
-            'no fraction' => [9.0000, 10],
-            'lower half'  => [9.1234, 9],
+            'no fraction' => [9.0000, 8.1, 10],
+            'lower half'  => [9.1234, 8.3, 9],
         ];
     }
 }

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -168,6 +168,10 @@ public function __construct(
      */
     protected function parseSelections($rowData, $entityId)
     {
+        if (empty($rowData['bundle_values'])) {
+            return [];
+        }
+
         $rowData['bundle_values'] = str_replace(
             self::BEFORE_OPTION_VALUE_DELIMITER,
             $this->_entityModel->getMultipleValueSeparator(),

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -294,6 +294,11 @@ public function saveDataProvider()
                 'bunch' => ['bundle_values' => 'value1', 'sku' => 'sku', 'name' => 'name'],
                 'allowImport' => false
             ],
+            'Import without bundle values' => [
+                'skus' => ['newSku' => ['sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle']]],
+                'bunch' => ['sku' => 'sku', 'name' => 'name'],
+                'allowImport' => true,
+            ],
             [
                 'skus' => ['newSku' => [
                     'sku' => ['sku' => 'sku', 'entity_id' => 3, 'type_id' => 'bundle'],

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -215,14 +215,21 @@ protected function getBasePrice()
     }
 
     /**
+     * Calculates savings percentage according to the given tier price amount
+     * and related product price amount.
+     *
      * @param AmountInterface $amount
+     *
      * @return float
      */
     public function getSavePercent(AmountInterface $amount)
     {
+        $productPriceAmount = $this->priceInfo->getPrice(
+            FinalPrice::PRICE_CODE
+        )->getAmount();
+
         return round(
-            100 - ((100 / $this->priceInfo->getPrice(FinalPrice::PRICE_CODE)->getValue())
-                * $amount->getBaseAmount())
+            100 - ((100 / $productPriceAmount->getValue()) * $amount->getValue())
         );
     }
 

app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php

@@ -10,6 +10,8 @@
 
 use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\GroupManagement;
 
@@ -250,7 +252,7 @@ public function testGetterTierPriceList($tierPrices, $basePrice, $expectedResult
     {
         $this->product->setData(TierPrice::PRICE_CODE, $tierPrices);
 
-        $price = $this->createMock(\Magento\Framework\Pricing\Price\PriceInterface::class);
+        $price = $this->createMock(PriceInterface::class);
         $price->expects($this->any())->method('getValue')->will($this->returnValue($basePrice));
 
         $this->calculator->expects($this->atLeastOnce())->method('getAmount')
@@ -341,27 +343,37 @@ public function providerForGetterTierPriceList()
     }
 
     /**
-     * @covers \Magento\Catalog\Pricing\Price\TierPrice::__construct
-     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getSavePercent
-     * @covers \Magento\Catalog\Pricing\Price\TierPrice::getBasePrice
+     * @param float $basePrice
+     * @param float $tierPrice
+     * @param float $savedPercent
+     *
      * @dataProvider dataProviderGetSavePercent
      */
     public function testGetSavePercent($basePrice, $tierPrice, $savedPercent)
     {
-        $price = $this->createMock(\Magento\Framework\Pricing\Price\PriceInterface::class);
+        /** @var AmountInterface|\PHPUnit_Framework_MockObject_MockObject $amount */
+        $amount = $this->getMockForAbstractClass(AmountInterface::class);
 
-        $this->priceInfo->expects(static::atLeastOnce())
-            ->method('getPrice')
-            ->with(FinalPrice::PRICE_CODE)
-            ->willReturn($price);
-        $price->expects(static::atLeastOnce())
+        $amount->expects($this->any())
+            ->method('getValue')
+            ->willReturn($tierPrice);
+
+        $basePriceAmount = $this->getMockForAbstractClass(AmountInterface::class);
+
+        $basePriceAmount->expects($this->any())
             ->method('getValue')
             ->willReturn($basePrice);
 
-        $amount = $this->getMockForAbstractClass(\Magento\Framework\Pricing\Amount\AmountInterface::class);
-        $amount->expects($this->atLeastOnce())
-            ->method('getBaseAmount')
-            ->will($this->returnValue($tierPrice));
+        $price = $this->getMockForAbstractClass(PriceInterface::class);
+
+        $price->expects($this->any())
+            ->method('getAmount')
+            ->willReturn($basePriceAmount);
+
+        $this->priceInfo->expects($this->any())
+            ->method('getPrice')
+            ->with(FinalPrice::PRICE_CODE)
+            ->willReturn($price);
 
         $this->assertEquals($savedPercent, $this->model->getSavePercent($amount));
     }

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);
         }