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

Author: glo23503

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

@@ -53,6 +53,7 @@
 class Eav extends AbstractModifier
 {
     public const SORT_ORDER_MULTIPLIER = 10;
+    public const PRECISION = 2;
 
     /**
      * @var LocatorInterface
@@ -1126,9 +1127,7 @@ 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]);
+        $value = \Zend_Locale_Math::normalize(\Zend_Locale_Math::round($value, self::PRECISION));
 
         return $value;
     }

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -605,36 +605,24 @@ define([
         ],
         'validate-not-negative-number': [
             function (value) {
-                if (utils.isEmptyNoTrim(value)) {
-                    return true;
-                }
-                value = utils.parseNumber(value);
-
-                return !isNaN(value) && value >= 0;
+                return utils.isEmptyNoTrim(value) || !isNaN(utils.parseNumber(value))
+                    && value >= 0 && (/^\s*-?\d+([,.]\d+)*\s*%?\s*$/).test(value);
 
             },
             $.mage.__('Please enter a number 0 or greater in this field.')
         ],
         // validate-not-negative-number should be replaced in all places with this one and then removed
         'validate-zero-or-greater': [
             function (value) {
-                if (utils.isEmptyNoTrim(value)) {
-                    return true;
-                }
-                value = utils.parseNumber(value);
-
-                return !isNaN(value) && value >= 0;
+                return utils.isEmptyNoTrim(value) || !isNaN(utils.parseNumber(value))
+                    && value >= 0 && (/^\s*-?\d+([,.]\d+)*\s*%?\s*$/).test(value);
             },
             $.mage.__('Please enter a number 0 or greater in this field.')
         ],
         'validate-greater-than-zero': [
             function (value) {
-                if (utils.isEmptyNoTrim(value)) {
-                    return true;
-                }
-                value = utils.parseNumber(value);
-
-                return !isNaN(value) && value > 0;
+                return utils.isEmptyNoTrim(value) || !isNaN(utils.parseNumber(value))
+                    && value > 0 && (/^\s*-?\d+([,.]\d+)*\s*%?\s*$/).test(value);
             },
             $.mage.__('Please enter a number greater than 0 in this field.')
         ],