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,7 +15,6 @@
 use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 
 /**
  * Product options section abstract block.
@@ -55,33 +54,24 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      */
     private $calculateCustomOptionCatalogRule;
 
-    /**
-     * @var CalculatorInterface
-     */
-    protected $calculator;
-
     /**
      * @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
      */
     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,
-        CalculatorInterface $calculator = null
+        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
     ) {
         $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
         $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule
             ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
-        $this->calculator = $calculator
-            ?? ObjectManager::getInstance()->get(CalculatorInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -199,7 +189,7 @@ protected function _formatPrice($value, $flag = true)
         $context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
         $optionAmount = !$isPercent
             ? $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context)
-            : $this->calculator->getAmount($value['pricing_value'], $this->getProduct(), null, $context);
+            : $customOptionPrice->getCustomRoundAmount($value['pricing_value'], $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
             $optionAmount,
             $customOptionPrice,

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

@@ -124,6 +124,8 @@ public function getValue($priceCode = \Magento\Catalog\Pricing\Price\BasePrice::
     }
 
     /**
+     * Get Custom Amount object
+     *
      * @param float $amount
      * @param null|bool|string|array $exclude
      * @param null|array $context
@@ -161,6 +163,19 @@ public function getCustomOptionRange($getMin, $priceCode = \Magento\Catalog\Pric
         return $this->priceCurrency->convertAndRound($optionValue);
     }
 
+    /**
+     * Get custom amount without currency convert
+     *
+     * @param float|string $amount
+     * @param null|array $context
+     * @return AmountInterface
+     */
+    public function getCustomRoundAmount($amount, $context = [])
+    {
+        $amount = $this->priceCurrency->roundPrice($amount);
+        return $this->calculator->getAmount($amount, $this->getProduct(), null, $context);
+    }
+
     /**
      * Return price for select custom options
      *

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckCustomOptionPriceDifferentCurrencyTest.xml

@@ -20,14 +20,20 @@
         </annotations>
         <before>
             <magentoCLI command="config:set currency/options/allow EUR,USD" stepKey="setCurrencyAllow"/>
-            <createData entity="SimpleProduct2" stepKey="createProduct">
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
                 <field key="price">10</field>
             </createData>
             <updateData createDataKey="createProduct" entity="productWithCheckbox" stepKey="updateProductWithOptions"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set currency/options/allow USD" stepKey="setCurrencyAllow"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPageOnStorefront">
             <argument name="product" value="$createProduct$"/>
@@ -36,6 +42,6 @@
         <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchEURCurrency">
             <argument name="currency" value="EUR"/>
         </actionGroup>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '8.6961')}}" stepKey="checkPriceProductOptionEUR"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '8.7')}}" stepKey="checkPriceProductOptionEUR"/>
     </test>
 </tests>