ACP2E-420: Price in a Scheduled Update divided by 1000 depending on the Locale

Author: glo23503

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

@@ -825,7 +825,6 @@
         <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtual_sku</data>
         <data key="price">9000.00</data>
-        <data key="formattedPrice">9,000.00</data>
         <data key="quantity">999</data>
         <data key="status">In Stock</data>
         <data key="visibility">Catalog, Search</data>
@@ -847,7 +846,6 @@
         <data key="name" unique="suffix">VirtualProduct</data>
         <data key="sku" unique="suffix">virtual_sku</data>
         <data key="price">9000.00</data>
-        <data key="formattedPrice">9,000.00</data>
         <data key="quantity">999</data>
         <data key="status">Out of Stock</data>
         <data key="visibility">Catalog, Search</data>

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

@@ -97,7 +97,7 @@
         </assertEquals>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
-            <expectedResult type="string">${{virtualProductOutOfStock.formattedPrice}}</expectedResult>
+            <expectedResult type="string">${{virtualProductOutOfStock.price}}</expectedResult>
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
     </test>

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

@@ -150,7 +150,7 @@
         </assertEquals>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="productPriceAmount"/>
         <assertEquals stepKey="assertOldPriceTextOnProductPage">
-            <expectedResult type="string">${{virtualProductCustomImportOptions.formattedPrice}}</expectedResult>
+            <expectedResult type="string">${{virtualProductCustomImportOptions.price}}</expectedResult>
             <actualResult type="variable">productPriceAmount</actualResult>
         </assertEquals>
 

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -137,11 +137,6 @@ class CustomOptions extends AbstractModifier
      */
     protected $meta = [];
 
-    /**
-     * @var CurrencyInterface
-     */
-    private $localeCurrency;
-
     /**
      * @param LocatorInterface $locator
      * @param StoreManagerInterface $storeManager
@@ -1183,22 +1178,7 @@ protected function getCurrencySymbol()
     }
 
     /**
-     * The getter function to get the locale currency for real application code
-     *
-     * @return \Magento\Framework\Locale\CurrencyInterface
-     *
-     * @deprecated 101.0.0
-     */
-    private function getLocaleCurrency()
-    {
-        if ($this->localeCurrency === null) {
-            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()->get(CurrencyInterface::class);
-        }
-        return $this->localeCurrency;
-    }
-
-    /**
-     * Format price according to the locale of the currency
+     * Format price
      *
      * @param mixed $value
      * @return string
@@ -1210,9 +1190,11 @@ protected function formatPrice($value)
             return null;
         }
 
-        $store = $this->storeManager->getStore();
-        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
-        $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $roundValue = call_user_func([\Zend_Locale_Math::class, 'round'], $value, 2);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $value = call_user_func([\Zend_Locale_Math::class, 'normalize'], $roundValue);
 
         return $value;
     }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -53,7 +53,6 @@
 class Eav extends AbstractModifier
 {
     public const SORT_ORDER_MULTIPLIER = 10;
-    public const PRECISION = 2;
 
     /**
      * @var LocatorInterface
@@ -1108,7 +1107,7 @@ protected function formatPrice($value)
         }
 
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $roundValue = call_user_func([\Zend_Locale_Math::class, 'round'], $value, self::PRECISION);
+        $roundValue = call_user_func([\Zend_Locale_Math::class, 'round'], $value, 2);
 
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $value = call_user_func([\Zend_Locale_Math::class, 'normalize'], $roundValue);

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -32,11 +32,6 @@ class General extends AbstractModifier
      */
     protected $arrayManager;
 
-    /**
-     * @var \Magento\Framework\Locale\CurrencyInterface
-     */
-    private $localeCurrency;
-
     /**
      * @var AttributeRepositoryInterface
      */
@@ -417,23 +412,7 @@ protected function customizeNameListeners(array $meta)
     }
 
     /**
-     * The getter function to get the locale currency for real application code
-     *
-     * @return \Magento\Framework\Locale\CurrencyInterface
-     *
-     * @deprecated 101.0.0
-     */
-    private function getLocaleCurrency()
-    {
-        if ($this->localeCurrency === null) {
-            $this->localeCurrency = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Locale\CurrencyInterface::class);
-        }
-        return $this->localeCurrency;
-    }
-
-    /**
-     * Format price according to the locale of the currency
+     * Format price
      *
      * @param  mixed $value
      * @return string
@@ -445,15 +424,16 @@ protected function formatPrice($value)
             return null;
         }
 
-        $store = $this->locator->getStore();
-        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
-        $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $roundValue = call_user_func([\Zend_Locale_Math::class, 'round'], $value, 2);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $value = call_user_func([\Zend_Locale_Math::class, 'normalize'], $roundValue);
 
         return $value;
     }
 
     /**
-     * Format number according to the locale of the currency and precision of input
+     * Format number according precision of input
      *
      * @param  mixed $value
      * @return string
@@ -467,15 +447,10 @@ protected function formatNumber($value)
 
         $value = (float)$value;
         $precision = strlen(substr(strrchr($value, "."), 1));
-        $store = $this->locator->getStore();
-        $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
-        $value = $currency->toCurrency(
-            $value,
-            [
-                'display' => \Magento\Framework\Currency::NO_SYMBOL,
-                'precision' => $precision
-            ]
-        );
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $roundValue = call_user_func([\Zend_Locale_Math::class, 'round'], $value, $precision);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $value = call_user_func([\Zend_Locale_Math::class, 'normalize'], $roundValue);
 
         return $value;
     }