Skip to content

Commit

Permalink
magento#9139 Unable to set negative product's quantity fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
magentoabu committed May 17, 2017
1 parent fa68470 commit 617b204
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private function prepareMeta()
'dataScope' => 'qty',
'validation' => [
'validate-number' => true,
'validate-digits' => true,
'validate-integer' => true,
'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
],
'imports' => [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
<item name="validation" xsi:type="array">
<item name="validate-number" xsi:type="boolean">true</item>
<item name="validate-digits" xsi:type="boolean">true</item>
<item name="validate-integer" xsi:type="boolean">true</item>
<item name="less-than-equals-to" xsi:type="number">99999999</item>
</item>
<item name="sortOrder" xsi:type="number">200</item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ define([
*/
handleChanges: function (value) {
var isDigits = value !== 1;

this.validation['validate-number'] = !isDigits;
this.validation['validate-digits'] = isDigits;

this.validation['validate-integer'] = isDigits;
this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
this.validate();
}
Expand Down
9 changes: 9 additions & 0 deletions app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,15 @@ define([
},
$.mage.__('Please enter a valid number in this field.')
],
"validate-integer": [
function(value) {
return (
utils.isEmptyNoTrim(value)
|| (!isNaN(utils.parseNumber(value)) && /^\s*-?\d*\s*$/.test(value))
);
},
$.mage.__('Please enter a valid integer in this field.')
],
"validate-number-range": [
function(value, param) {
if (utils.isEmptyNoTrim(value)) {
Expand Down

0 comments on commit 617b204

Please sign in to comment.