ENGCOM-2353: Add missing false-check to the ConfiguredRegularPrice price-model #16820

magento-engcom-team · magento-engcom-team · commit b4c9055e6f28 · 2018-07-15T04:57:11.000-05:00
- Merge Pull Request magento/magento2#16820 from ronak2ram/magento2:ronak2ram-patch-2 - Merged commits: 1. 7791be8
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php
@@ -63,7 +63,7 @@ public function setItem(ItemInterface $item) : ConfiguredRegularPrice
 
         return $this;
     }
-    
+
     /**
      * Price value of product with configured options.
      *
@@ -73,7 +73,7 @@ public function getValue()
     {
         $basePrice = parent::getValue();
 
-        return $this->item
+        return $this->item && $basePrice !== false
             ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
             : $basePrice;
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function setItem(ItemInterface $item) : ConfiguredRegularPrice`
`63`	`63`
`64`	`64`	`return $this;`
`65`	`65`	`}`
`66`		`-`
	`66`	`+`
`67`	`67`	`/**`
`68`	`68`	`* Price value of product with configured options.`
`69`	`69`	`*`
`@@ -73,7 +73,7 @@ public function getValue()`
`73`	`73`	`{`
`74`	`74`	`$basePrice = parent::getValue();`
`75`	`75`
`76`		`- return $this->item`
	`76`	`+ return $this->item && $basePrice !== false`
`77`	`77`	`? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)`
`78`	`78`	`: $basePrice;`
`79`	`79`	`}`