🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes

Accepted Community Pull Requests:
 - #25478: Clearer PHPDocs comment for AbstractBlock and Escaper (by @edward-simpson)
 - #24815: Fix #21684 - Currency sign for "Layered Navigation Price Step" is not according to default settings (by @Bartlomiejsz)
 - #24471: Resolve Export Coupon Code Grid redirect to DashBoard when create New Cart Price Rule issue24468 (by @edenduong)
 - #25640: set correct pram like in BlockRepository implementation (by @torhoehn)
 - #25452: Elastic Search 5 Indexing Performance Issue with product mapper (by @behnamshayani)
 - #22917: #22856: Catalog price rules are not working with custom options as expected. (by @p-bystritsky)


Fixed GitHub Issues:
 - #21684: Currency sign for "Layered Navigation Price Step" is not according to default settings (reported by @dmak) has been fixed in #24815 by @Bartlomiejsz in 2.4-develop branch
   Related commits:
     1. 2c70512
     2. 2a5c87c
     3. d351549
     4. 9c4c965

 - #24468: Export Coupon Code Grid redirect to DashBoard when create New Cart Price Rule (reported by @edenduong) has been fixed in #24471 by @edenduong in 2.4-develop branch
   Related commits:
     1. 5d175a3
     2. 853a1e5

 - #20966: Elastic Search 5 Indexing Performance Issue (reported by @DarthFly) has been fixed in #25452 by @behnamshayani in 2.4-develop branch
   Related commits:
     1. df50692
     2. 1a0cae2
     3. d1c848f
     4. 0bf7a4c
     5. 2b5b986

 - #22856: Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page (reported by @dcwnaveen) has been fixed in #22917 by @p-bystritsky in 2.4-develop branch
   Related commits:
     1. a8f3b9e
     2. 4fb5da8
     3. 56142ae
     4. 7489207
     5. 20ae9e3
     6. 8b159d0
     7. 4ac980b
     8. fbea751

Author: VladimirZaets

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -3,16 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/**
- * Product options abstract type block
- *
- * @author     Magento Core Team <[email protected]>
- */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Block\Product\View\Options;
 
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Product options section abstract block.
@@ -47,20 +45,29 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      */
     protected $_catalogHelper;
 
+    /**
+     * @var CalculateCustomOptionCatalogRule
+     */
+    private $calculateCustomOptionCatalogRule;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param array $data
+     * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
-        array $data = []
+        array $data = [],
+        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
     ) {
         $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
+        $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule
+            ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
         parent::__construct($context, $data);
     }
 
@@ -161,6 +168,15 @@ protected function _formatPrice($value, $flag = true)
         $priceStr = $sign;
 
         $customOptionPrice = $this->getProduct()->getPriceInfo()->getPrice('custom_option_price');
+
+        if (!$value['is_percent']) {
+            $value['pricing_value'] = $this->calculateCustomOptionCatalogRule->execute(
+                $this->getProduct(),
+                (float)$value['pricing_value'],
+                (bool)$value['is_percent']
+            );
+        }
+
         $context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
         $optionAmount = $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(