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.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product;
 
@@ -205,7 +204,10 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Get resource instance
+     *
+     * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+     * @deprecated 102.0.0 because resource models should be used directly
      */
     protected function _getResource()
     {
@@ -255,7 +257,7 @@ public function getValueById($valueId)
      *
      * @param string $type
      * @return bool
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function hasValues($type = null)
     {
@@ -570,7 +572,9 @@ public function getSearchableData($productId, $storeId)
     }
 
     /**
-     * @inheritdoc
+     * Clearing object's data
+     *
+     * @return $this
      */
     protected function _clearData()
     {
@@ -580,7 +584,9 @@ protected function _clearData()
     }
 
     /**
-     * @inheritdoc
+     * Clearing cyclic references
+     *
+     * @return $this
      */
     protected function _clearReferences()
     {
@@ -601,7 +607,9 @@ protected function _getValidationRulesBeforeSave()
     }
 
     /**
-     * @inheritdoc
+     * Get product SKU
+     *
+     * @return string
      */
     public function getProductSku()
     {
@@ -613,7 +621,9 @@ public function getProductSku()
     }
 
     /**
-     * @inheritdoc
+     * Get option id
+     *
+     * @return int|null
      * @codeCoverageIgnoreStart
      */
     public function getOptionId()
@@ -622,47 +632,60 @@ public function getOptionId()
     }
 
     /**
-     * @inheritdoc
+     * Get option title
+     *
+     * @return string
      */
     public function getTitle()
     {
         return $this->_getData(self::KEY_TITLE);
     }
 
     /**
-     * @inheritdoc
+     * Get option type
+     *
+     * @return string
      */
     public function getType()
     {
         return $this->_getData(self::KEY_TYPE);
     }
 
     /**
-     * @inheritdoc
+     * Get sort order
+     *
+     * @return int
      */
     public function getSortOrder()
     {
         return $this->_getData(self::KEY_SORT_ORDER);
     }
 
     /**
-     * @inheritdoc
+     * Get is require
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getIsRequire()
     {
         return $this->_getData(self::KEY_IS_REQUIRE);
     }
 
     /**
-     * @inheritdoc
+     * Get price type
+     *
+     * @return string|null
      */
     public function getPriceType()
     {
         return $this->_getData(self::KEY_PRICE_TYPE);
     }
 
     /**
-     * @inheritdoc
+     * Get Sku
+     *
+     * @return string|null
      */
     public function getSku()
     {
@@ -710,71 +733,98 @@ public function getImageSizeY()
     }
 
     /**
-     * @inheritdoc
+     * Set product SKU
+     *
+     * @param string $productSku
+     * @return $this
      */
     public function setProductSku($productSku)
     {
         return $this->setData(self::KEY_PRODUCT_SKU, $productSku);
     }
 
     /**
-     * @inheritdoc
+     * Set option id
+     *
+     * @param int $optionId
+     * @return $this
      */
     public function setOptionId($optionId)
     {
         return $this->setData(self::KEY_OPTION_ID, $optionId);
     }
 
     /**
-     * @inheritdoc
+     * Set option title
+     *
+     * @param string $title
+     * @return $this
      */
     public function setTitle($title)
     {
         return $this->setData(self::KEY_TITLE, $title);
     }
 
     /**
-     * @inheritdoc
+     * Set option type
+     *
+     * @param string $type
+     * @return $this
      */
     public function setType($type)
     {
         return $this->setData(self::KEY_TYPE, $type);
     }
 
     /**
-     * @inheritdoc
+     * Set sort order
+     *
+     * @param int $sortOrder
+     * @return $this
      */
     public function setSortOrder($sortOrder)
     {
         return $this->setData(self::KEY_SORT_ORDER, $sortOrder);
     }
 
     /**
-     * @inheritdoc
+     * Set is require
+     *
+     * @param bool $isRequired
+     * @return $this
      */
     public function setIsRequire($isRequired)
     {
         return $this->setData(self::KEY_IS_REQUIRE, $isRequired);
     }
 
     /**
-     * @inheritdoc
+     * Set price
+     *
+     * @param float $price
+     * @return $this
      */
     public function setPrice($price)
     {
         return $this->setData(self::KEY_PRICE, $price);
     }
 
     /**
-     * @inheritdoc
+     * Set price type
+     *
+     * @param string $priceType
+     * @return $this
      */
     public function setPriceType($priceType)
     {
         return $this->setData(self::KEY_PRICE_TYPE, $priceType);
     }
 
     /**
-     * @inheritdoc
+     * Set Sku
+     *
+     * @param string $sku
+     * @return $this
      */
     public function setSku($sku)
     {
@@ -915,7 +965,7 @@ public function setExtensionAttributes(
     private function getOptionRepository()
     {
         if (null === $this->optionRepository) {
-            $this->optionRepository = ObjectManager::getInstance()
+            $this->optionRepository = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Catalog\Model\Product\Option\Repository::class);
         }
         return $this->optionRepository;
@@ -929,7 +979,7 @@ private function getOptionRepository()
     private function getMetadataPool()
     {
         if (null === $this->metadataPool) {
-            $this->metadataPool = ObjectManager::getInstance()
+            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         }
         return $this->metadataPool;

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

@@ -9,6 +9,8 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\PriceModifierInterface;
+use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
+use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
@@ -54,23 +56,53 @@ public function execute(
         $regularPrice = (float)$product->getPriceInfo()
             ->getPrice(RegularPrice::PRICE_CODE)
             ->getValue();
-        $catalogRulePrice = $product->getPriceInfo()->getPrice('final_price')->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);
-            $discount = $catalogRulePrice / $regularPrice;
-            $finalOptionPrice = $optionPrice*$discount;
+            $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
+                $regularPrice + $optionPrice,
+                $product
+            );
+            $finalOptionPrice = $totalCatalogRulePrice - $catalogRulePrice;
         } else {
             $finalOptionPrice = $this->getOptionPriceWithoutPriceRule(
                 $optionPriceValue,
                 $isPercent,
-                $regularPrice
+                $this->getGetBasePriceWithOutCatalogRules($product)
             );
         }
 
         return $this->priceCurrency->convertAndRound($finalOptionPrice);
     }
 
+    /**
+     * Get product base price without catalog rules applied.
+     *
+     * @param Product $product
+     * @return float
+     */
+    private function getGetBasePriceWithOutCatalogRules(Product $product): float
+    {
+        $basePrice = null;
+        foreach ($product->getPriceInfo()->getPrices() as $price) {
+            if ($price instanceof BasePriceProviderInterface
+                && $price->getPriceCode() !== CatalogRulePrice::PRICE_CODE
+                && $price->getValue() !== false
+            ) {
+                $basePrice = min(
+                    $price->getValue(),
+                    $basePrice ?? $price->getValue()
+                );
+            }
+        }
+
+        return $basePrice ?? $product->getPrice();
+    }
+
     /**
      * Calculate option price without catalog price rule discount.
      *

app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithSelectFixedMethodTest.xml

@@ -15,7 +15,7 @@
             <description value="Admin should be able to apply the catalog price rule for simple product with custom options"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-14771"/>
-            <group value="CatalogRule"/>
+            <group value="catalogRule"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
@@ -33,7 +33,7 @@
 
             <!-- Update all products to have custom options -->
             <updateData createDataKey="createProduct1" entity="productWithFixedOptions" stepKey="updateProductWithOptions1"/>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCron groups="index" stepKey="runCronIndex"/>
         </before>
         <after>
             <!-- Delete products and category -->
@@ -42,7 +42,7 @@
 
             <!-- Delete the catalog price rule -->
             <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
-            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
                 <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
             </actionGroup>
@@ -60,13 +60,10 @@
         <actionGroup ref="SelectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
 
         <!-- Save and apply the new catalog price rule -->
-        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-        <actionGroup ref="CreateCatalogRuleStagingUpdateWithItsStartActionGroup" stepKey="fillOutActionGroup">
-            <argument name="stagingUpdate" value="_defaultCatalogRule"/>
-        </actionGroup>
+        <actionGroup ref="AdminEnableCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
 
         <!-- Navigate to category on store front -->
-        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToStorefrontCategoryPage"/>
 
         <!-- Check product 1 name on store front category page -->
         <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Name">