Skip to content

Commit 2a51388

Browse files
merge magento-commerce/2.4-develop into magento-tsg/2.4-develop-pr127
2 parents 2833b46 + dfd17e9 commit 2a51388

File tree

1 file changed

+30
-6
lines changed
  • app/code/Magento/Ui/view/base/web/js/lib/validation

1 file changed

+30
-6
lines changed

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

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -836,23 +836,47 @@ define([
836836
],
837837
'less-than-equals-to': [
838838
function (value, params) {
839-
if ($.isNumeric(params) && $.isNumeric(value)) {
840-
return parseFloat(value) <= parseFloat(params);
839+
value = utils.parseNumber(value);
840+
841+
if (isNaN(parseFloat(params))) {
842+
params = $(params).val();
843+
}
844+
845+
params = utils.parseNumber(params);
846+
847+
if (!isNaN(params) && !isNaN(value)) {
848+
this.lteToVal = params;
849+
850+
return value <= params;
841851
}
842852

843853
return true;
844854
},
845-
$.mage.__('Please enter a value less than or equal to {0}.')
855+
function () {
856+
return $.mage.__('Please enter a value less than or equal to %s.').replace('%s', this.lteToVal);
857+
}
846858
],
847859
'greater-than-equals-to': [
848860
function (value, params) {
849-
if ($.isNumeric(params) && $.isNumeric(value)) {
850-
return parseFloat(value) >= parseFloat(params);
861+
value = utils.parseNumber(value);
862+
863+
if (isNaN(parseFloat(params))) {
864+
params = $(params).val();
865+
}
866+
867+
params = utils.parseNumber(params);
868+
869+
if (!isNaN(params) && !isNaN(value)) {
870+
this.gteToVal = params;
871+
872+
return value >= params;
851873
}
852874

853875
return true;
854876
},
855-
$.mage.__('Please enter a value greater than or equal to {0}.')
877+
function () {
878+
return $.mage.__('Please enter a value greater than or equal to %s.').replace('%s', this.gteToVal);
879+
}
856880
],
857881
'validate-emails': [
858882
function (value) {

0 commit comments

Comments
 (0)