Skip to content

Commit 94048fe

Browse files
author
Bohdan Korablov
committed
MAGETWO-46646: Validate Quantity fields depends to "Qty Uses Decimals" Option
1 parent 0249d6b commit 94048fe

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ private function prepareMeta()
195195
'additionalClasses' => 'admin__field-small',
196196
'dataScope' => 'qty',
197197
'validation' => [
198-
'validate-number' => true
198+
'validate-number' => true,
199+
'validate-digits' => true,
199200
],
200201
'imports' => [
201202
'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
9696
<item name="validation" xsi:type="array">
9797
<item name="validate-number" xsi:type="boolean">true</item>
98+
<item name="validate-digits" xsi:type="boolean">true</item>
9899
</item>
99100
<item name="sortOrder" xsi:type="number">200</item>
100101
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
@@ -170,6 +171,7 @@
170171
<item name="dataScope" xsi:type="string">min_sale_qty</item>
171172
<item name="validation" xsi:type="array">
172173
<item name="validate-number" xsi:type="boolean">true</item>
174+
<item name="validate-digits" xsi:type="boolean">true</item>
173175
</item>
174176
<item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
175177
<item name="imports" xsi:type="array">
@@ -468,6 +470,7 @@
468470
<item name="dataScope" xsi:type="string">qty_increments</item>
469471
<item name="validation" xsi:type="array">
470472
<item name="validate-number" xsi:type="boolean">true</item>
473+
<item name="validate-digits" xsi:type="boolean">true</item>
471474
</item>
472475
<item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
473476
<item name="imports" xsi:type="array">

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,18 @@ define([
1010

1111
return Abstract.extend({
1212
defaults: {
13-
numberValidator: {
14-
'validate-number': true
15-
},
16-
digitsValidator: {
17-
'validate-digits': true
18-
},
1913
valueUpdate: 'input'
2014
},
2115

2216
/**
2317
* Change validator
2418
*/
2519
handleChanges: function (value) {
26-
if (value === 1) {
27-
this.validation = this.numberValidator;
28-
this.validate();
29-
} else {
30-
this.validation = this.digitsValidator;
31-
this.validate();
32-
}
20+
var isDigits = value !==1;
21+
22+
this.validation['validate-number'] = !isDigits;
23+
this.validation['validate-digits'] = isDigits;
24+
this.validate();
3325
}
3426
});
3527
});

0 commit comments

Comments
 (0)