diff --git a/app/code/Magento/Inventory/composer.json b/app/code/Magento/Inventory/composer.json index 2a616138c3a49..2d9ede32a4a5b 100644 --- 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/app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php b/app/code/Magento/InventoryAdminUi/Model/OptionSource/CarrierSource.php similarity index 95% rename from app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php rename to app/code/Magento/InventoryAdminUi/Model/OptionSource/CarrierSource.php index 8546ce906eeec..3e71861812966 100644 --- a/app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php +++ b/app/code/Magento/InventoryAdminUi/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/app/code/Magento/Inventory/Model/OptionSource/RegionSource.php b/app/code/Magento/InventoryAdminUi/Model/OptionSource/RegionSource.php similarity index 95% rename from app/code/Magento/Inventory/Model/OptionSource/RegionSource.php rename to app/code/Magento/InventoryAdminUi/Model/OptionSource/RegionSource.php index e130068b13e5b..2d4b312033105 100644 --- a/app/code/Magento/Inventory/Model/OptionSource/RegionSource.php +++ b/app/code/Magento/InventoryAdminUi/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 index 4c10386b50e77..4826a36c25822 100644 --- 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 index 8b2c81cb62016..e8b4779f88937 100644 --- 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 index b74d040677319..16236e9f85dea 100644 --- a/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml +++ b/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml @@ -16,7 +16,7 @@ - Magento\Inventory\Model\OptionSource\CarrierSource + Magento\InventoryAdminUi\Model\OptionSource\CarrierSource 1 Use Ctrl+Click for check several values or uncheck value diff --git a/app/code/Magento/InventoryAdminUi/etc/module.xml b/app/code/Magento/InventoryAdminUi/etc/module.xml index 58535effa5379..749a5b42db252 100644 --- a/app/code/Magento/InventoryAdminUi/etc/module.xml +++ b/app/code/Magento/InventoryAdminUi/etc/module.xml @@ -6,5 +6,5 @@ */ --> - +