MC-30626: Custom Option with Percent price is converted to a currency twice

Author: engcom-Echo

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

@@ -15,6 +15,8 @@
 use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * Product options section abstract block.
@@ -54,24 +56,42 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      */
     private $calculateCustomOptionCatalogRule;
 
+    /**
+     * @var CalculatorInterface
+     */
+    private $calculator;
+
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
     /**
      * @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|null $calculateCustomOptionCatalogRule
+     * @param CalculatorInterface|null $calculator
+     * @param PriceCurrencyInterface|null $priceCurrency
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
         array $data = [],
-        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
+        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null,
+        CalculatorInterface $calculator = null,
+        PriceCurrencyInterface $priceCurrency = null
     ) {
         $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
         $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule
             ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
+        $this->calculator = $calculator
+            ?? ObjectManager::getInstance()->get(CalculatorInterface::class);
+        $this->priceCurrency = $priceCurrency
+            ?? ObjectManager::getInstance()->get(PriceCurrencyInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -186,9 +206,14 @@ protected function _formatPrice($value, $flag = true)
             }
         }
 
-        $context['should_not_be_converted'] = $isPercent;
         $context[CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG] = true;
-        $optionAmount = $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
+        $optionAmount = $isPercent
+            ? $this->calculator->getAmount(
+                $this->priceCurrency->roundPrice($value['pricing_value']),
+                $this->getProduct(),
+                null,
+                $context
+            ): $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
             $optionAmount,
             $customOptionPrice,

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

@@ -14,6 +14,7 @@
 
 /**
  * Class OptionPrice
+ *
  */
 class CustomOptionPrice extends AbstractPrice implements CustomOptionPriceInterface
 {
@@ -123,8 +124,6 @@ public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::
     }
 
     /**
-     * Calculate Custom Amount
-     *
      * @param float $amount
      * @param null|bool|string|array $exclude
      * @param null|array $context
@@ -133,9 +132,7 @@ public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::
     public function getCustomAmount($amount = null, $exclude = null, $context = [])
     {
         if (null !== $amount) {
-            $amount = (isset($context['should_not_be_converted']) && $context['should_not_be_converted'])
-                ? $this->priceCurrency->roundPrice($amount)
-                : $this->priceCurrency->convertAndRound($amount);
+            $amount = $this->priceCurrency->convertAndRound($amount);
         } else {
             $amount = $this->getValue();
         }