Skip to content

Commit 14fa20e

Browse files
ENGCOM-5420: Fixed issue #21650 #23253
- Merge Pull Request #23253 from geeta07/magento2:fix-21650 - Merged commits: 1. 7bed431
2 parents 034806f + 7bed431 commit 14fa20e

File tree

2 files changed

+19
-1
lines changed
  • app/code/Magento/Ui/view/base/web/js/lib/validation
  • dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation

2 files changed

+19
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ define([
651651
'validate-number': [
652652
function (value) {
653653
return utils.isEmptyNoTrim(value) ||
654-
!isNaN(utils.parseNumber(value)) && /^\s*-?\d*(,\d*)*(\.\d*)?\s*$/.test(value);
654+
!isNaN(utils.parseNumber(value)) && /^\s*-?\d{1,}(?:[.,|'|\s]\d{1,})*(?:[.,|'|\s]\d{2})?-?\s*$/.test(value);
655655
},
656656
$.mage.__('Please enter a valid number in this field.')
657657
],

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/validation/rules.test.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,25 @@ define([
6363

6464
expect(rules['validate-number'].handler(value)).toBe(true);
6565
});
66+
67+
it('Check on space', function () {
68+
var value = '10 000';
6669

70+
expect(rules['validate-number'].handler(value)).toBe(true);
71+
});
72+
73+
it('Check on formatted float (For International price)', function () {
74+
var value = '10.000,00';
75+
76+
expect(rules['validate-number'].handler(value)).toBe(true);
77+
});
78+
79+
it('Check on formatted float (For International price)', function () {
80+
var value = "10'000.00";
81+
82+
expect(rules['validate-number'].handler(value)).toBe(true);
83+
});
84+
6785
it('Check on not a number', function () {
6886
var value = 'string';
6987

0 commit comments

Comments
 (0)