From 184abdb0e1596d174b987bf92d7abc755cc55558 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 24 May 2022 09:50:02 -0500
Subject: [PATCH 1/3] adjust conditions for applying discount

---
 .../Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
index 1090867aa51a5..3a611cff34414 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
@@ -59,7 +59,7 @@ public function execute(
             $product
         );
         // Apply catalog price rules to product options only if catalog price rules are applied to product.
-        if ($catalogRulePrice < $regularPrice) {
+        if ($catalogRulePrice <= $regularPrice) {
             $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
             $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
                 $regularPrice + $optionPrice,

From 1be67b842ebe93450090641cf71a4388659c7059 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 25 May 2022 03:35:11 -0500
Subject: [PATCH 2/3] changing condition

---
 .../Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
index 3a611cff34414..73cc09dd6ed58 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
@@ -59,7 +59,7 @@ public function execute(
             $product
         );
         // Apply catalog price rules to product options only if catalog price rules are applied to product.
-        if ($catalogRulePrice <= $regularPrice) {
+        if ($catalogRulePrice < $regularPrice || $catalogRulePrice == 0.00 && $regularPrice == 0.00) {
             $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
             $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
                 $regularPrice + $optionPrice,

From be880d69f7837e939c12df0edf30994f0b06c754 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 30 May 2022 14:48:40 +0300
Subject: [PATCH 3/3] minor adjustment

---
 .../Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
index 73cc09dd6ed58..4462afcb03738 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
@@ -59,7 +59,7 @@ public function execute(
             $product
         );
         // Apply catalog price rules to product options only if catalog price rules are applied to product.
-        if ($catalogRulePrice < $regularPrice || $catalogRulePrice == 0.00 && $regularPrice == 0.00) {
+        if ($catalogRulePrice < $regularPrice || ($catalogRulePrice == 0.00 && $regularPrice == 0.00)) {
             $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
             $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
                 $regularPrice + $optionPrice,