MC-35065: Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/Product/Option/Value.php

@@ -10,6 +10,8 @@
 use Magento\Catalog\Model\Product\Option;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
 use Magento\Catalog\Pricing\Price\RegularPrice;
 
@@ -69,6 +71,11 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      */
     private $customOptionPriceCalculator;
 
+    /**
+     * @var CalculateCustomOptionCatalogRule
+     */
+    private $calculateCustomOptionCatalogRule;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -77,6 +84,7 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param CustomOptionPriceCalculator|null $customOptionPriceCalculator
+     * @param CalculateCustomOptionCatalogRule|null $CalculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -85,11 +93,14 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        CustomOptionPriceCalculator $customOptionPriceCalculator = null
+        CustomOptionPriceCalculator $customOptionPriceCalculator = null,
+        CalculateCustomOptionCatalogRule $CalculateCustomOptionCatalogRule = null
     ) {
         $this->_valueCollectionFactory = $valueCollectionFactory;
         $this->customOptionPriceCalculator = $customOptionPriceCalculator
-            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
+            ?? ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
+        $this->calculateCustomOptionCatalogRule = $CalculateCustomOptionCatalogRule
+            ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
 
         parent::__construct(
             $context,
@@ -253,7 +264,11 @@ public function saveValues()
     public function getPrice($flag = false)
     {
         if ($flag) {
-            return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, BasePrice::PRICE_CODE);
+            return $this->calculateCustomOptionCatalogRule->execute(
+                $this->getProduct(),
+                (float)$this->getData(self::KEY_PRICE),
+                $this->getPriceType() === self::TYPE_PERCENT
+            );
         }
         return $this->_getData(self::KEY_PRICE);
     }

app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Price;
+
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\PriceModifierInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+/**
+ * Calculates prices of custom options of the product with catalog rules applied.
+ */
+class CalculateCustomOptionCatalogRule
+{
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
+    /**
+     * @var PriceModifierInterface
+     */
+    private $priceModifier;
+
+    /**
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param PriceModifierInterface $priceModifier
+     */
+    public function __construct(
+        PriceCurrencyInterface $priceCurrency,
+        PriceModifierInterface $priceModifier
+    ) {
+        $this->priceModifier = $priceModifier;
+        $this->priceCurrency = $priceCurrency;
+    }
+
+    /**
+     * Calculate prices of custom options of the product with catalog rules applied.
+     *
+     * @param Product $product
+     * @param float $optionPriceValue
+     * @param bool $isPercent
+     * @return float
+     */
+    public function execute(
+        Product $product,
+        float $optionPriceValue,
+        bool $isPercent
+    ): float {
+        $regularPrice = (float)$product->getPriceInfo()
+            ->getPrice(RegularPrice::PRICE_CODE)
+            ->getValue();
+        $catalogRulePrice = $this->priceModifier->modifyPrice(
+            $regularPrice,
+            $product
+        );
+
+        // Apply catalog price rules to product options only if catalog price rules are applied to product.
+        if ($catalogRulePrice < $regularPrice) {
+            $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
+            $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
+                $regularPrice + $optionPrice,
+                $product
+            );
+            $finalOptionPrice = $totalCatalogRulePrice - $catalogRulePrice;
+        } else {
+            $finalOptionPrice = $this->getOptionPriceWithoutPriceRule(
+                $optionPriceValue,
+                $isPercent,
+                $regularPrice
+            );
+        }
+
+        return $this->priceCurrency->convertAndRound($finalOptionPrice);
+    }
+
+
+    /**
+     * Calculate option price without catalog price rule discount.
+     *
+     * @param float $optionPriceValue
+     * @param bool $isPercent
+     * @param float $basePrice
+     * @return float
+     */
+    private function getOptionPriceWithoutPriceRule(float $optionPriceValue, bool $isPercent, float $basePrice): float
+    {
+        return $isPercent ? $basePrice * $optionPriceValue / 100 : $optionPriceValue;
+    }
+}