From cebc94c92ba07aa9f4904f656fdc6f92cb8e5835 Mon Sep 17 00:00:00 2001 From: tkotosz Date: Thu, 10 May 2018 12:03:21 +0200 Subject: [PATCH 1/2] Add missing false-check to the ConfiguredRegularPrice price-model --- .../Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php index a3336644878c7..3f7c7b3eb8bf1 100644 --- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php +++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php @@ -70,6 +70,11 @@ public function setItem(ItemInterface $item) public function getValue() { $basePrice = parent::getValue(); + + if ($basePrice === false) { + return $basePrice; + } + return $this->item ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item) : $basePrice; From 654b468d9fac07d08ed00f82b71419c2b7e6ce2b Mon Sep 17 00:00:00 2001 From: Tibor Kotosz Date: Thu, 10 May 2018 13:35:37 +0200 Subject: [PATCH 2/2] Update ConfiguredRegularPrice.php --- .../Catalog/Pricing/Price/ConfiguredRegularPrice.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php index 3f7c7b3eb8bf1..66dc783e1401e 100644 --- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php +++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php @@ -70,12 +70,8 @@ public function setItem(ItemInterface $item) public function getValue() { $basePrice = parent::getValue(); - - if ($basePrice === false) { - return $basePrice; - } - return $this->item + return ($this->item && $basePrice !== false) ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item) : $basePrice; }