MAGETWO-46646: Validate Quantity fields depends to "Qty Uses Decimals" Option

Author: Bohdan Korablov

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

@@ -117,7 +117,7 @@ protected function prepareStockData(array $data)
         foreach ($stockDataFields as $field) {
             if (isset($data[$productId][self::DATA_SOURCE_DEFAULT][self::STOCK_DATA_FIELDS][$field])) {
                 $data[$productId][self::DATA_SOURCE_DEFAULT][self::STOCK_DATA_FIELDS][$field] =
-                    (int)$data[$productId][self::DATA_SOURCE_DEFAULT][self::STOCK_DATA_FIELDS][$field];
+                    (float)$data[$productId][self::DATA_SOURCE_DEFAULT][self::STOCK_DATA_FIELDS][$field];
             }
         }
 
@@ -186,6 +186,7 @@ private function prepareMeta()
                     ) - 1,
             ];
             $qty['arguments']['data']['config'] = [
+                'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
                 'dataType' => 'number',
                 'formElement' => 'input',
                 'componentType' => 'field',
@@ -196,6 +197,9 @@ private function prepareMeta()
                 'validation' => [
                     'validate-number' => true
                 ],
+                'imports' => [
+                    'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',
+                ],
                 'sortOrder' => 10,
             ];
             $advancedInventoryButton['arguments']['data']['config'] = [

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

@@ -89,6 +89,7 @@
             <field name="qty">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
+                        <item name="component" xsi:type="string">Magento_CatalogInventory/js/components/qty-validator-changer</item>
                         <item name="label" xsi:type="string" translate="true">Qty</item>
                         <item name="formElement" xsi:type="string">input</item>
                         <item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
@@ -99,6 +100,7 @@
                         <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
+                            <item name="handleChanges" xsi:type="string">${$.provider}:data.product.stock_data.is_qty_decimal</item>
                         </item>
                     </item>
                 </argument>
@@ -163,12 +165,16 @@
                 <field name="min_sale_qty">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
+                            <item name="component" xsi:type="string">Magento_CatalogInventory/js/components/qty-validator-changer</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">min_sale_qty</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
+                            <item name="imports" xsi:type="array">
+                                <item name="handleChanges" xsi:type="string">${$.provider}:data.product.stock_data.is_qty_decimal</item>
+                            </item>
                         </item>
                     </argument>
                 </field>
@@ -237,14 +243,11 @@
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
                         <item name="label" xsi:type="string" translate="true">Qty Uses Decimals</item>
-                        <item name="component" xsi:type="string">Magento_CatalogInventory/js/components/decimal-qty</item>
                         <item name="formElement" xsi:type="string">select</item>
                         <item name="dataScope" xsi:type="string">stock_data.is_qty_decimal</item>
                         <item name="value" xsi:type="number">0</item>
                         <item name="sortOrder" xsi:type="number">600</item>
                         <item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
-                        <item name="quantityIncrements" xsi:type="string">ns = ${ $.ns }, index=qty_increments</item>
-                        <item name="minSaleQuantity" xsi:type="string">ns = ${ $.ns }, index=min_sale_qty</item>
                         <item name="imports" xsi:type="array">
                             <item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
                         </item>
@@ -460,12 +463,16 @@
                 <field name="qty_increments">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
+                            <item name="component" xsi:type="string">Magento_CatalogInventory/js/components/qty-validator-changer</item>
                             <item name="formElement" xsi:type="string">input</item>
                             <item name="dataScope" xsi:type="string">qty_increments</item>
                             <item name="validation" xsi:type="array">
                                 <item name="validate-number" xsi:type="boolean">true</item>
                             </item>
                             <item name="value" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>
+                            <item name="imports" xsi:type="array">
+                                <item name="handleChanges" xsi:type="string">${$.provider}:data.product.stock_data.is_qty_decimal</item>
+                            </item>
                         </item>
                     </argument>
                 </field>

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

@@ -0,0 +1,35 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/abstract'
+], function (Abstract) {
+    'use strict';
+
+    return Abstract.extend({
+        defaults: {
+            numberValidator: {
+                'validate-number': true
+            },
+            digitsValidator: {
+                'validate-digits': true
+            },
+            valueUpdate: 'input'
+        },
+
+        /**
+         * Change validator
+         */
+        handleChanges: function (value) {
+            if (value === 1) {
+                this.validation = this.numberValidator;
+                this.validate();
+            } else {
+                this.validation = this.digitsValidator;
+                this.validate();
+            }
+        }
+    });
+});

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

@@ -366,9 +366,10 @@ define([
                 message = !this.disabled() && this.visible() ? result.message : '',
                 isValid = this.disabled() || !this.visible() || result.passed;
 
+            this.error(message);
+
             //TODO: Implement proper result propagation for form
             if (!isValid) {
-                this.error(message);
                 this.source.set('params.invalid', true);
             }