Merge remote-tracking branch 'origin/MAGETWO-53331' into BUGS

Author: slavvka

app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

@@ -124,7 +124,7 @@ public function getValue()
                 $value = $product->getData('final_price') * ($selectionPriceValue / 100);
             } else {
                 // calculate price for selection type fixed
-                $value = $this->priceCurrency->convert($selectionPriceValue) * $this->quantity;
+                $value = $this->priceCurrency->convert($selectionPriceValue);
             }
         }
         if (!$this->useRegularPrice) {

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

@@ -313,6 +313,67 @@ public function testGetValueTypeFixedWithoutSelectionPriceType($useRegularPrice)
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
 
+    /**
+     * test for method getValue with type Fixed and selectionPriceType is empty or zero
+     *
+     * @param bool $useRegularPrice
+     * @dataProvider useRegularPriceDataProvider
+     */
+    public function testFixedPriceWithMultipleQty($useRegularPrice)
+    {
+        $qty = 2;
+
+        $selectionPrice = new \Magento\Bundle\Pricing\Price\BundleSelectionPrice(
+            $this->productMock,
+            $qty,
+            $this->calculatorMock,
+            $this->priceCurrencyMock,
+            $this->bundleMock,
+            $this->eventManagerMock,
+            $this->discountCalculatorMock,
+            $useRegularPrice
+        );
+
+        $this->setupSelectionPrice($useRegularPrice);
+        $regularPrice = 100.125;
+        $discountedPrice = 70.453;
+        $convertedValue = 100.247;
+        $actualPrice = $useRegularPrice ? $convertedValue : $discountedPrice;
+        $expectedPrice = $useRegularPrice ? round($convertedValue, 2) : round($discountedPrice, 2);
+
+        $this->bundleMock->expects($this->once())
+            ->method('getPriceType')
+            ->will($this->returnValue(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED));
+        $this->productMock->expects($this->once())
+            ->method('getSelectionPriceType')
+            ->will($this->returnValue(false));
+        $this->productMock->expects($this->any())
+            ->method('getSelectionPriceValue')
+            ->will($this->returnValue($regularPrice));
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('convert')
+            ->with($regularPrice)
+            ->will($this->returnValue($convertedValue));
+
+        if (!$useRegularPrice) {
+            $this->discountCalculatorMock->expects($this->once())
+                ->method('calculateDiscount')
+                ->with(
+                    $this->equalTo($this->bundleMock),
+                    $this->equalTo($convertedValue)
+                )
+                ->will($this->returnValue($discountedPrice));
+        }
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($actualPrice)
+            ->will($this->returnValue($expectedPrice));
+
+        $this->assertEquals($expectedPrice, $selectionPrice->getValue());
+    }
+
     public function useRegularPriceDataProvider()
     {
         return [

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -55,7 +55,6 @@ define([
                 this._setOption('priceFormat', priceBox.priceBox('option').priceConfig.priceFormat);
                 priceBox.priceBox('setDefault', this.options.optionConfig.prices);
             }
-            this._applyQtyFix();
             this._applyOptionNodeFix(options);
 
             options.on('change', this._onBundleOptionChanged.bind(this));
@@ -113,6 +112,7 @@ define([
          * Helper to fix backend behavior:
          *  - if default qty large than 1 then backend multiply price in config
          *
+         * @deprecated
          * @private
          */
         _applyQtyFix: function applyQtyFix() {

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

@@ -291,6 +291,7 @@ protected function _assignProducts()
             'thumbnail',
             'links_purchased_separately',
             'links_title',
+            'price_type'
         ];
 
         $productCollection->addPriceData()