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

@@ -12,10 +12,10 @@
 
 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;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 
 /**
  * Product options section abstract block.
@@ -55,24 +55,33 @@ 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
+        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null,
+        CalculatorInterface $calculator = 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);
     }
 
@@ -188,7 +197,9 @@ protected function _formatPrice($value, $flag = true)
         }
 
         $context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
-        $optionAmount = $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
+        $optionAmount = !$isPercent
+            ? $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context)
+            : $this->calculator->getAmount($value['pricing_value'], $this->getProduct(), null, $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
             $optionAmount,
             $customOptionPrice,

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -577,6 +577,10 @@
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionDropDownWithLongValuesTitle</requiredEntity>
     </entity>
+    <entity name="productWithCheckbox" type="product">
+        <var key="sku" entityType="product" entityKey="sku" />
+        <requiredEntity type="product_option">ProductOptionCheckbox</requiredEntity>
+    </entity>
     <entity name="productWithDropdownOption" type="product">
         <var key="sku" entityType="product" entityKey="sku" />
         <requiredEntity type="product_option">ProductOptionValueDropdown</requiredEntity>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckCustomOptionPriceDifferentCurrencyTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Custom options"/>
+            <title value="Check custom option price with different currency"/>
+            <description value="Check custom option price with different currency on the product page"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-38926"/>
+            <useCaseId value="MC-30626"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set currency/options/allow EUR,USD" stepKey="setCurrencyAllow"/>
+            <createData entity="SimpleProduct2" stepKey="createProduct">
+                <field key="price">10</field>
+            </createData>
+            <updateData createDataKey="createProduct" entity="productWithCheckbox" stepKey="updateProductWithOptions"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set currency/options/allow USD" stepKey="setCurrencyAllow"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+        </after>
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPageOnStorefront">
+            <argument name="product" value="$createProduct$"/>
+        </actionGroup>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '12.3')}}" stepKey="checkPriceProductOptionUSD"/>
+        <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchEURCurrency">
+            <argument name="currency" value="EUR"/>
+        </actionGroup>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(ProductOptionCheckbox.title, '8.6961')}}" stepKey="checkPriceProductOptionEUR"/>
+    </test>
+</tests>