Merge pull request magento#1121 from magento-engcom/1116-InventoryAdm…

…inUi-modularity magento#1116 Resolve dependency InventoryAdminUi on Inventory module
VitaliyBoyko · May 13, 2018 · 77960ad · 77960ad
2 parents b50a893 + 2744181
commit 77960ad
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 10 deletions.
diff --git a/app/code/Magento/Inventory/composer.json b/app/code/Magento/Inventory/composer.json
@@ -5,7 +5,6 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*",
-        "magento/module-directory": "*",
         "magento/module-shipping": "*"
     },
     "type": "magento2-module",

diff --git a/...tory/Model/OptionSource/CarrierSource.php → ...inUi/Model/OptionSource/CarrierSource.php b/...tory/Model/OptionSource/CarrierSource.php → ...inUi/Model/OptionSource/CarrierSource.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Inventory\Model\OptionSource;
+namespace Magento\InventoryAdminUi\Model\OptionSource;
 
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Shipping\Model\Config;

diff --git a/...ntory/Model/OptionSource/RegionSource.php → ...minUi/Model/OptionSource/RegionSource.php b/...ntory/Model/OptionSource/RegionSource.php → ...minUi/Model/OptionSource/RegionSource.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Inventory\Model\OptionSource;
+namespace Magento\InventoryAdminUi\Model\OptionSource;
 
 use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\Data\OptionSourceInterface;

diff --git a/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php b/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php
@@ -9,7 +9,7 @@
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Inventory\Model\OptionSource\RegionSource;
+use Magento\InventoryAdminUi\Model\OptionSource\RegionSource;
 use Magento\Ui\Component\Listing\Columns\Column;
 
 /**

diff --git a/app/code/Magento/InventoryAdminUi/composer.json b/app/code/Magento/InventoryAdminUi/composer.json
@@ -5,14 +5,11 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*",
-        "magento/module-inventory": "*",
         "magento/module-backend": "*",
         "magento/module-shipping": "*",
+        "magento/module-directory": "*",
         "magento/module-ui": "*"
     },
-    "suggest": {
-        "magento/module-directory": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",

diff --git a/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml b/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml
@@ -16,7 +16,7 @@
                 </field>
                 <field id="inventory_source_default_carrier_config" type="multiselect" translate="label" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Specify Carriers</label>
-                    <source_model>Magento\Inventory\Model\OptionSource\CarrierSource</source_model>
+                    <source_model>Magento\InventoryAdminUi\Model\OptionSource\CarrierSource</source_model>
                     <can_be_empty>1</can_be_empty>
                     <comment>Use Ctrl+Click for check several values or uncheck value</comment>
                     <depends>

diff --git a/app/code/Magento/InventoryAdminUi/etc/module.xml b/app/code/Magento/InventoryAdminUi/etc/module.xml
@@ -6,5 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_InventoryAdminUi" setup_version="1.0.0"/>
+    <module name="Magento_InventoryAdminUi" setup_version="1.0.0" />
 </config>