Merge remote-tracking branch 'github-magento2ce/MAGETWO-91657' into EPAM-PR-18

Author: nikshostko

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

@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 101.1.0
      */
     public function modifyData(array $data)
@@ -54,8 +54,11 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * Add tier price info to meta array.
+     *
      * @since 101.1.0
+     * @param array $meta
+     * @return array
      */
     public function modifyMeta(array $meta)
     {
@@ -150,8 +153,8 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
                                     'dataType' => Price::NAME,
                                     'addbefore' => '%',
                                     'validation' => [
-                                        'validate-number' => true,
-                                        'less-than-equals-to' => 100
+                                        'required-entry' => true,
+                                        'validate-positive-percent-decimal' => true
                                     ],
                                     'visible' => $firstOption
                                         && $firstOption['value'] == ProductPriceOptionsInterface::VALUE_PERCENT,

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

@@ -692,6 +692,24 @@ define([
             },
             $.mage.__('The value is not within the specified range.')
         ],
+        'validate-positive-percent-decimal': [
+            function (value) {
+                var numValue;
+
+                if (utils.isEmptyNoTrim(value) || !/^\s*-?\d*(\.\d*)?\s*$/.test(value)) {
+                    return false;
+                }
+
+                numValue = utils.parseNumber(value);
+
+                if (isNaN(numValue)) {
+                    return false;
+                }
+
+                return utils.isBetween(numValue, 0.01, 100);
+            },
+            $.mage.__('Please enter a valid percentage discount value greater than 0.')
+        ],
         'validate-digits': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || !/[^\d]/.test(value);