MAGETWO-36325: Catalog Prices on Frontend do not include the cost of required Custom Option

 - fixed

Author: Mike Weis

app/code/Magento/Bundle/Pricing/Render/FinalPriceBox.php

@@ -8,21 +8,33 @@
 
 use Magento\Bundle\Pricing\Price;
 use Magento\Catalog\Pricing\Render as CatalogRender;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 
 /**
  * Class for final_price rendering
  */
 class FinalPriceBox extends CatalogRender\FinalPriceBox
 {
     /**
-     * Check if bundle product has one more custom option with different prices
+     * Check if bundle product has one or more options, or custom options, with different prices
      *
      * @return bool
      */
     public function showRangePrice()
     {
-        /** @var Price\BundleOptionPrice $optionPrice */
-        $optionPrice = $this->getPriceType(Price\BundleOptionPrice::PRICE_CODE);
-        return $optionPrice->getValue() !== $optionPrice->getMaxValue();
+        //Check the bundle options
+        /** @var Price\BundleOptionPrice $bundleOptionPrice */
+        $bundleOptionPrice = $this->getPriceType(Price\BundleOptionPrice::PRICE_CODE);
+        $showRange = $bundleOptionPrice->getValue() != $bundleOptionPrice->getMaxValue();
+
+        if (!$showRange) {
+            //Check the custom options, if any
+            /** @var \Magento\Catalog\Pricing\Price\CustomOptionPrice $customOptionPrice */
+            $customOptionPrice = $this->getPriceType(CustomOptionPrice::PRICE_CODE);
+            $showRange =
+                $customOptionPrice->getCustomOptionRange(true) != $customOptionPrice->getCustomOptionRange(false);
+        }
+
+        return $showRange;
     }
 }

app/code/Magento/Bundle/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -5,9 +5,9 @@
  */
 namespace Magento\Bundle\Test\Unit\Pricing\Render;
 
-use \Magento\Bundle\Pricing\Render\FinalPriceBox;
-
+use Magento\Bundle\Pricing\Render\FinalPriceBox;
 use Magento\Bundle\Pricing\Price;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 
 class FinalPriceBoxTest extends \PHPUnit_Framework_TestCase
 {
@@ -34,31 +34,50 @@ public function setUp()
     /**
      * @dataProvider showRangePriceDataProvider
      */
-    public function testShowRangePrice($value, $maxValue, $result)
+    public function testShowRangePrice($optMinValue, $optMaxValue, $custMinValue, $custMaxValue, $expectedShowRange)
     {
+        $enableCustomOptionMocks = ($optMinValue == $optMaxValue);
+
         $priceInfo = $this->getMock('Magento\Framework\Pricing\PriceInfo\Base', [], [], '', false);
-        $optionPrice = $this->getMockBuilder('Magento\Bundle\Pricing\Price\BundleOptionPrice')
+        $bundleOptionPrice = $this->getMockBuilder('Magento\Bundle\Pricing\Price\BundleOptionPrice')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customOptionPrice = $this->getMockBuilder('Magento\Catalog\Pricing\Price\CustomOptionPrice')
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->saleableItem->expects($this->atLeastOnce())
             ->method('getPriceInfo')
             ->will($this->returnValue($priceInfo));
 
-        $priceInfo->expects($this->atLeastOnce())
+        $priceInfo->expects($this->at(0))
             ->method('getPrice')
             ->with(Price\BundleOptionPrice::PRICE_CODE)
-            ->will($this->returnValue($optionPrice));
+            ->will($this->returnValue($bundleOptionPrice));
+        if ($enableCustomOptionMocks) {
+            $priceInfo->expects($this->at(1))
+                ->method('getPrice')
+                ->with(CustomOptionPrice::PRICE_CODE)
+                ->will($this->returnValue($customOptionPrice));
+        }
 
-        $optionPrice->expects($this->once())
+        $bundleOptionPrice->expects($this->once())
             ->method('getValue')
-            ->will($this->returnValue($value));
-
-        $optionPrice->expects($this->once())
+            ->will($this->returnValue($optMinValue));
+        $bundleOptionPrice->expects($this->once())
             ->method('getMaxValue')
-            ->will($this->returnValue($maxValue));
+            ->will($this->returnValue($optMaxValue));
 
-        $this->assertEquals($result, $this->model->showRangePrice());
+        if ($enableCustomOptionMocks) {
+            $customOptionPrice->expects($this->at(0))
+                ->method('getCustomOptionRange')
+                ->will($this->returnValue($custMinValue));
+            $customOptionPrice->expects($this->at(1))
+                ->method('getCustomOptionRange')
+                ->will($this->returnValue($custMaxValue));
+        }
+
+        $this->assertEquals($expectedShowRange, $this->model->showRangePrice());
     }
 
     /**
@@ -67,9 +86,37 @@ public function testShowRangePrice($value, $maxValue, $result)
     public function showRangePriceDataProvider()
     {
         return [
-            ['value' => 40.2, 'maxValue' => 45., 'result' => true],
-            ['value' => false, 'maxValue' => false, 'result' => false],
-            ['value' => 45.0, 'maxValue' => 45., 'result' => false],
+            'bundle options different, custom options noop' => [
+                'optMinValue' => 40.2,
+                'optMaxValue' => 45.,
+                'custMinValue' => 0,
+                'custMaxValue' => 0,
+                'expectedShowRange' => true
+            ],
+
+            'bundle options same boolean, custom options same boolean' => [
+                'optMinValue' => false,
+                'optMaxValue' => false,
+                'custMinValue' => false,
+                'custMaxValue' => false,
+                'expectedShowRange' => false
+            ],
+
+            'bundle options same numeric, custom options same' => [
+                'optMinValue' => 45.0,
+                'optMaxValue' => 45,
+                'custMinValue' => 1.0,
+                'custMaxValue' => 1,
+                'expectedShowRange' => false
+            ],
+
+            'bundle options same numeric, custom options different' => [
+                'optMinValue' => 45.0,
+                'optMaxValue' => 45.,
+                'custMinValue' => 0,
+                'custMaxValue' => 1,
+                'expectedShowRange' => true
+            ],
         ];
     }
 }