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

@@ -206,14 +206,14 @@ protected function _formatPrice($value, $flag = true)
             }
         }
 
-        $context[CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG] = true;
+        $context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
         $optionAmount = $isPercent
             ? $this->calculator->getAmount(
                 $this->priceCurrency->roundPrice($value['pricing_value']),
                 $this->getProduct(),
                 null,
                 $context
-            ): $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
+            ) : $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
             $optionAmount,
             $customOptionPrice,

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCustomOptionCheckboxByPriceActionGroup.xml renamed to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontCustomOptionCheckboxByPriceActionGroup.xml

@@ -8,13 +8,13 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertCustomOptionCheckboxByPriceActionGroup">
+    <actionGroup name="AssertStorefrontCustomOptionCheckboxByPriceActionGroup">
         <annotations>
             <description>Validates that the provided price for Custom Option Checkbox is present on the Storefront Product page.</description>
         </annotations>
         <arguments>
             <argument name="optionTitle" type="string" defaultValue="{{ProductOptionCheckbox.title}}"/>
-            <argument name="price" type="string"/>
+            <argument name="price" type="string" defaultValue="10"/>
         </arguments>
 
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptionsCheckbox(optionTitle, price)}}" stepKey="checkPriceProductOptionCheckbox"/>

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

@@ -19,32 +19,29 @@
             <group value="catalog"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set currency/options/allow EUR,USD" stepKey="setCurrencyAllow"/>
+            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForEUR.value}}" stepKey="setCurrencyAllow"/>
             <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"/>
+            <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}}" stepKey="setCurrencyAllow"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPageOnStorefront">
             <argument name="product" value="$createProduct$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionUSD">
+        <actionGroup ref="AssertStorefrontCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionUSD">
             <argument name="price" value="12.3"/>
         </actionGroup>
         <actionGroup ref="StorefrontSwitchCurrencyActionGroup" stepKey="switchEURCurrency">
             <argument name="currency" value="EUR"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionEUR">
+        <actionGroup ref="AssertStorefrontCustomOptionCheckboxByPriceActionGroup" stepKey="checkPriceProductOptionEUR">
             <argument name="price" value="8.7"/>
         </actionGroup>
     </test>