Merge pull request magento#650 from magento-engcom/569

MSI: 569: Add Column Source Status for all SourceItem grids
fe-lix- · Mar 9, 2018 · ab4fc02 · ab4fc02
2 parents 3ba68fa + af0273e
commit ab4fc02
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/app/code/Magento/InventoryCatalog/Ui/DataProvider/Product/Form/Modifier/SourceItems.php b/app/code/Magento/InventoryCatalog/Ui/DataProvider/Product/Form/Modifier/SourceItems.php
@@ -100,7 +100,7 @@ private function getSourceItemsData(): array
         $collection->join(
             ['s' => $this->resourceConnection->getTableName(SourceResourceModel::TABLE_NAME_SOURCE)],
             sprintf('s.%s = main_table.%s', SourceInterface::SOURCE_CODE, SourceItemInterface::SOURCE_CODE),
-            ['source_name' => SourceInterface::NAME]
+            ['source_name' => SourceInterface::NAME, 'source_status' => SourceInterface::ENABLED]
         );
 
         $sourceItemsData = [];
@@ -110,6 +110,7 @@ private function getSourceItemsData(): array
                 SourceItemInterface::QUANTITY => $row[SourceItemInterface::QUANTITY],
                 SourceItemInterface::STATUS => $row[SourceItemInterface::STATUS],
                 SourceInterface::NAME => $row['source_name'],
+                'source_status' => $row['source_status'] ? __('Enabled') : __('Disabled')
             ];
         }
         return $sourceItemsData;

diff --git a/app/code/Magento/InventoryCatalog/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/InventoryCatalog/view/adminhtml/ui_component/product_form.xml
@@ -109,11 +109,19 @@
                         <label translate="true">Name</label>
                     </settings>
                 </field>
-                <field name="status" formElement="select" sortOrder="30">
+                <field name="source_status" formElement="input" sortOrder="30">
+                    <settings>
+                        <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
+                        <dataType>text</dataType>
+                        <dataScope>source_status</dataScope>
+                        <label translate="true">Source Status</label>
+                    </settings>
+                </field>
+                <field name="status" formElement="select" sortOrder="40">
                     <settings>
                         <dataType>text</dataType>
                         <dataScope>status</dataScope>
-                        <label translate="true">Status</label>
+                        <label translate="true">Source Item Status</label>
                     </settings>
                     <formElements>
                         <select>
@@ -123,14 +131,14 @@
                         </select>
                     </formElements>
                 </field>
-                <field name="quantity" formElement="input" sortOrder="40">
+                <field name="quantity" formElement="input" sortOrder="50">
                     <settings>
                         <dataType>text</dataType>
                         <dataScope>quantity</dataScope>
                         <label translate="true">Qty</label>
                     </settings>
                 </field>
-                <field name="actionDelete" formElement="actionDelete" sortOrder="50">
+                <field name="actionDelete" formElement="actionDelete" sortOrder="90">
                     <settings>
                         <label translate="true">Unassign</label>
                     </settings>

diff --git a/...entoryConfigurableProduct/view/adminhtml/ui_component/configurable_quantity_templates.xml b/...entoryConfigurableProduct/view/adminhtml/ui_component/configurable_quantity_templates.xml
@@ -54,6 +54,7 @@
                 <item name="map" xsi:type="array">
                     <item name="source" xsi:type="string">source</item>
                     <item name="source_code" xsi:type="string">source_code</item>
+                    <item name="source_status" xsi:type="string">source_status</item>
                 </item>
             </item>
         </argument>
@@ -87,7 +88,13 @@
                     <dataType>text</dataType>
                     <label translate="true">Source</label>
                     <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
+                </settings>
+            </field>
+            <field name="source_status" formElement="input">
+                <settings>
                     <dataType>text</dataType>
+                    <label translate="true">Source Status</label>
+                    <elementTmpl>ui/dynamic-rows/cells/text</elementTmpl>
                 </settings>
             </field>
             <field name="quantity" formElement="input">

diff --git a/...ento/InventoryConfigurableProduct/view/adminhtml/web/js/configurable-quantity-resolver.js b/...ento/InventoryConfigurableProduct/view/adminhtml/web/js/configurable-quantity-resolver.js
@@ -58,7 +58,8 @@ define([
             _.each(data, function (item) {
                 items.push({
                     'source': item.name,
-                    'source_code': item[this.identifier]
+                    'source_code': item[this.identifier],
+                    'source_status': parseInt(item.enabled, 10) ? $.mage.__('Enabled') : $.mage.__('Disabled')
                 });
             }.bind(this));
 

diff --git a/...ode/Magento/InventoryLowQuantityNotification/view/adminhtml/ui_component/product_form.xml b/...ode/Magento/InventoryLowQuantityNotification/view/adminhtml/ui_component/product_form.xml
@@ -18,7 +18,7 @@
                 </item>
             </argument>
             <container name="record" component="Magento_Ui/js/dynamic-rows/record">
-                <field name="notify_stock_qty" formElement="input" sortOrder="45">
+                <field name="notify_stock_qty" formElement="input" sortOrder="60">
                     <settings>
                         <dataType>text</dataType>
                         <dataScope>notify_stock_qty</dataScope>
@@ -28,7 +28,7 @@
                         </imports>
                     </settings>
                 </field>
-                <field name="notify_stock_qty_use_default" component="Magento_InventoryLowQuantityNotification/js/components/use-config-settings" formElement="checkbox" sortOrder="55">
+                <field name="notify_stock_qty_use_default" component="Magento_InventoryLowQuantityNotification/js/components/use-config-settings" formElement="checkbox" sortOrder="70">
                     <argument name="data" xsi:type="array">
                         <item name="config" xsi:type="array">
                             <item name="valueFromConfig" xsi:type="object">Magento\CatalogInventory\Model\Source\StockConfiguration</item>