From 577528c6965acfe0d240803ee19d47750772f65c Mon Sep 17 00:00:00 2001 From: Mickael Louzet Date: Fri, 1 Jul 2022 13:03:16 +0200 Subject: [PATCH 1/2] fix: call getPrice only if channelPrice is not null --- src/Model/Documentable/DocumentableProductTrait.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/Documentable/DocumentableProductTrait.php b/src/Model/Documentable/DocumentableProductTrait.php index 9cead518..99e59263 100644 --- a/src/Model/Documentable/DocumentableProductTrait.php +++ b/src/Model/Documentable/DocumentableProductTrait.php @@ -230,9 +230,9 @@ private function getCheapestVariantForChannel($channel) $variants = $this->getEnabledVariants(); foreach ($variants as $variant) { $channelPrice = $variant->getChannelPricingForChannel($channel); - if (null === $cheapestPrice || $channelPrice->getPrice() < $cheapestPrice) { - $cheapestPrice = $channelPrice->getPrice(); - $cheapestVariant = $variant; + if (null !== $channelPrice && (null === $cheapestPrice || $channelPrice->getPrice() < $cheapestPrice)) { + $cheapestPrice = $channelPrice->getPrice(); + $cheapestVariant = $variant; } } From 44aa15ec8ab8037af5798174aab7e356802254b3 Mon Sep 17 00:00:00 2001 From: Maxime Huran Date: Fri, 30 Jun 2023 14:13:52 +0200 Subject: [PATCH 2/2] Correct indent --- src/Model/Documentable/DocumentableProductTrait.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Model/Documentable/DocumentableProductTrait.php b/src/Model/Documentable/DocumentableProductTrait.php index 99e59263..c83eba73 100644 --- a/src/Model/Documentable/DocumentableProductTrait.php +++ b/src/Model/Documentable/DocumentableProductTrait.php @@ -231,8 +231,8 @@ private function getCheapestVariantForChannel($channel) foreach ($variants as $variant) { $channelPrice = $variant->getChannelPricingForChannel($channel); if (null !== $channelPrice && (null === $cheapestPrice || $channelPrice->getPrice() < $cheapestPrice)) { - $cheapestPrice = $channelPrice->getPrice(); - $cheapestVariant = $variant; + $cheapestPrice = $channelPrice->getPrice(); + $cheapestVariant = $variant; } }