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

Yu Tang · Yu Tang · commit 7ac81df1f8f9 · 2015-05-15T09:40:31.000-05:00
- Add all prices when calculating max price for checkbox and multiselect option
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Pricing\Price;
 
 use Magento\Catalog\Model\Product\Option\Value;
+use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Pricing\Price;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 
@@ -61,7 +62,10 @@ public function getValue()
                         } elseif ($price < $min) {
                             $min = $price;
                         }
-                        if ($price > $max) {
+                        $type = $optionItem->getType();
+                        if ($type == Option::OPTION_TYPE_CHECKBOX || $type == Option::OPTION_TYPE_MULTIPLE) {
+                            $max += $price;
+                        } elseif ($price > $max) {
                             $max = $price;
                         }
                     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CustomOptionPriceTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
 use \Magento\Catalog\Pricing\Price\CustomOptionPrice;
+use Magento\Catalog\Model\Product\Option;
 
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Catalog\Model\Product\Option\Value;
@@ -177,7 +178,7 @@ public function testGetValue()
         $option2Id = 2;
         $option2MaxPrice = 200;
         $option2MinPrice = 20;
-        $option2Type = 'choice';
+        $option2Type = Option::OPTION_TYPE_CHECKBOX;
 
         $optionsData = [
             [
@@ -229,7 +230,7 @@ public function testGetValue()
                 'option_id' => $option2Id,
                 'type' => $option2Type,
                 'min' => 0.,
-                'max' => $option2MaxPrice,
+                'max' => $option2MaxPrice + $option2MinPrice,
             ],
             [
                 'option_id' => $singleValueOptionId,

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace Magento\Catalog\Pricing\Price;`
`7`	`7`
`8`	`8`	`use Magento\Catalog\Model\Product\Option\Value;`
	`9`	`+use Magento\Catalog\Model\Product\Option;`
`9`	`10`	`use Magento\Catalog\Pricing\Price;`
`10`	`11`	`use Magento\Framework\Pricing\Price\AbstractPrice;`
`11`	`12`
`@@ -61,7 +62,10 @@ public function getValue()`
`61`	`62`	`} elseif ($price < $min) {`
`62`	`63`	`$min = $price;`
`63`	`64`	`}`
`64`		`- if ($price > $max) {`
	`65`	`+ $type = $optionItem->getType();`
	`66`	`+ if ($type == Option::OPTION_TYPE_CHECKBOX \|\| $type == Option::OPTION_TYPE_MULTIPLE) {`
	`67`	`+ $max += $price;`
	`68`	`+ } elseif ($price > $max) {`
`65`	`69`	`$max = $price;`
`66`	`70`	`}`
`67`	`71`	`}`