diff --git a/app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableBundleTypePlugin.php b/app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableBundleTypePlugin.php
similarity index 72%
rename from app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableBundleTypePlugin.php
rename to app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableBundleTypePlugin.php
index d28623062e14a..c1585ca9adfa8 100644
--- a/app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableBundleTypePlugin.php
+++ b/app/code/Magento/InventoryBundle/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableBundleTypePlugin.php
@@ -5,10 +5,10 @@
*/
declare(strict_types=1);
-namespace Magento\InventoryBundle\Plugin\InventoryConfiguration\IsSourceItemsAllowedForProductType;
+namespace Magento\InventoryBundle\Plugin\InventoryConfiguration\IsSourceItemManagementAllowedForProductType;
use Magento\Bundle\Model\Product\Type as BundleType;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Disable Source items management for Bundle product type.
@@ -16,14 +16,14 @@
class DisableBundleTypePlugin
{
/**
- * @param IsSourceItemsAllowedForProductType $subject
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $subject
* @param callable $proceed
* @param string $productType
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundExecute(
- IsSourceItemsAllowedForProductTypeInterface $subject,
+ IsSourceItemManagementAllowedForProductTypeInterface $subject,
callable $proceed,
string $productType
): bool {
diff --git a/app/code/Magento/InventoryBundle/composer.json b/app/code/Magento/InventoryBundle/composer.json
index 86f0ed91130db..37b21ac1804ae 100644
--- a/app/code/Magento/InventoryBundle/composer.json
+++ b/app/code/Magento/InventoryBundle/composer.json
@@ -7,7 +7,7 @@
"magento/module-bundle": "*"
},
"suggest": {
- "magento/module-inventory-configuration": "*"
+ "magento/module-inventory-configuration-api": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/InventoryBundle/etc/di.xml b/app/code/Magento/InventoryBundle/etc/di.xml
index 8227e77fc9225..1f3485d6a80e3 100644
--- a/app/code/Magento/InventoryBundle/etc/di.xml
+++ b/app/code/Magento/InventoryBundle/etc/di.xml
@@ -6,8 +6,8 @@
*/
-->
-
+
+ type="Magento\InventoryBundle\Plugin\InventoryConfiguration\IsSourceItemManagementAllowedForProductType\DisableBundleTypePlugin"/>
\ No newline at end of file
diff --git a/app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/UpdateSourceItemAtLegacyStockItemSavePlugin.php b/app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/UpdateSourceItemAtLegacyStockItemSavePlugin.php
index 7d7d2430570b1..064c46ed0af54 100755
--- a/app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/UpdateSourceItemAtLegacyStockItemSavePlugin.php
+++ b/app/code/Magento/InventoryCatalog/Plugin/CatalogInventory/UpdateSourceItemAtLegacyStockItemSavePlugin.php
@@ -14,7 +14,7 @@
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
use Magento\InventoryCatalog\Model\UpdateSourceItemBasedOnLegacyStockItem;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Class provides around Plugin on \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::save
@@ -28,9 +28,9 @@ class UpdateSourceItemAtLegacyStockItemSavePlugin
private $resourceConnection;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var UpdateSourceItemBasedOnLegacyStockItem
@@ -50,20 +50,20 @@ class UpdateSourceItemAtLegacyStockItemSavePlugin
/**
* @param UpdateSourceItemBasedOnLegacyStockItem $updateSourceItemBasedOnLegacyStockItem
* @param ResourceConnection $resourceConnection
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param GetProductTypesBySkusInterface $getProductTypeBySku
* @param GetSkusByProductIdsInterface $getSkusByProductIds
*/
public function __construct(
UpdateSourceItemBasedOnLegacyStockItem $updateSourceItemBasedOnLegacyStockItem,
ResourceConnection $resourceConnection,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
GetProductTypesBySkusInterface $getProductTypeBySku,
GetSkusByProductIdsInterface $getSkusByProductIds
) {
$this->updateSourceItemBasedOnLegacyStockItem = $updateSourceItemBasedOnLegacyStockItem;
$this->resourceConnection = $resourceConnection;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->getProductTypeBySku = $getProductTypeBySku;
$this->getSkusByProductIds = $getSkusByProductIds;
}
@@ -86,7 +86,7 @@ public function aroundSave(ItemResourceModel $subject, callable $proceed, Abstra
$proceed($legacyStockItem);
$typeId = $this->getTypeId($legacyStockItem);
- if ($this->isSourceItemsAllowedForProductType->execute($typeId)) {
+ if ($this->isSourceItemManagementAllowedForProductType->execute($typeId)) {
$this->updateSourceItemBasedOnLegacyStockItem->execute($legacyStockItem);
}
diff --git a/app/code/Magento/InventoryCatalog/composer.json b/app/code/Magento/InventoryCatalog/composer.json
index afe01ef089dc8..5ce3ebe14067e 100644
--- a/app/code/Magento/InventoryCatalog/composer.json
+++ b/app/code/Magento/InventoryCatalog/composer.json
@@ -9,7 +9,7 @@
"magento/module-inventory-api": "*",
"magento/module-inventory-catalog-api": "*",
"magento/module-store": "*",
- "magento/module-inventory-configuration": "*",
+ "magento/module-inventory-configuration-api": "*",
"magento/module-inventory-indexer": "*",
"magento/module-inventory-sales-api": "*"
},
diff --git a/app/code/Magento/InventoryCatalogAdminUi/Observer/ProcessSourceItemsObserver.php b/app/code/Magento/InventoryCatalogAdminUi/Observer/ProcessSourceItemsObserver.php
index 7f16c42a2bccd..06d580cdae4cc 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/Observer/ProcessSourceItemsObserver.php
+++ b/app/code/Magento/InventoryCatalogAdminUi/Observer/ProcessSourceItemsObserver.php
@@ -18,7 +18,7 @@
use Magento\InventoryApi\Api\SourceItemRepositoryInterface;
use Magento\InventoryCatalogApi\Api\DefaultSourceProviderInterface;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Save source product relations during product persistence via controller
@@ -29,9 +29,9 @@
class ProcessSourceItemsObserver implements ObserverInterface
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var SourceItemsProcessor
@@ -59,7 +59,7 @@ class ProcessSourceItemsObserver implements ObserverInterface
private $sourceItemRepository;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param SourceItemsProcessor $sourceItemsProcessor
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param DefaultSourceProviderInterface $defaultSourceProvider
@@ -67,14 +67,14 @@ class ProcessSourceItemsObserver implements ObserverInterface
* @param SourceItemRepositoryInterface $sourceItemRepository
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
SourceItemsProcessor $sourceItemsProcessor,
IsSingleSourceModeInterface $isSingleSourceMode,
DefaultSourceProviderInterface $defaultSourceProvider,
SearchCriteriaBuilderFactory $searchCriteriaBuilderFactory,
SourceItemRepositoryInterface $sourceItemRepository
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->sourceItemsProcessor = $sourceItemsProcessor;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->defaultSourceProvider = $defaultSourceProvider;
@@ -92,7 +92,7 @@ public function execute(EventObserver $observer)
{
/** @var ProductInterface $product */
$product = $observer->getEvent()->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false) {
return;
}
/** @var Save $controller */
diff --git a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/Quantity.php b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/Quantity.php
index 3b3c65c438344..bae33d96a6905 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/Quantity.php
+++ b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/Quantity.php
@@ -11,7 +11,7 @@
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Framework\Stdlib\ArrayManager;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Quantity modifier on CatalogInventory Product Editing Form
@@ -34,27 +34,27 @@ class Quantity extends AbstractModifier
private $locator;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* CatalogInventory constructor.
* @param ArrayManager $arrayManager
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param LocatorInterface $locator
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
*/
public function __construct(
ArrayManager $arrayManager,
IsSingleSourceModeInterface $isSingleSourceMode,
LocatorInterface $locator,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
) {
$this->arrayManager = $arrayManager;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->locator = $locator;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
}
/**
@@ -78,7 +78,7 @@ public function modifyMeta(array $meta)
$product = $this->locator->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false) {
return $meta;
}
diff --git a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/SourceItems.php b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/SourceItems.php
index 4aa9dce388202..1e111cf710c36 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/SourceItems.php
+++ b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/SourceItems.php
@@ -17,7 +17,7 @@
use Magento\InventoryApi\Api\Data\SourceItemInterface;
use Magento\InventoryCatalogAdminUi\Model\CanManageSourceItemsBySku;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Product form modifier. Add to form source data
@@ -25,9 +25,9 @@
class SourceItems extends AbstractModifier
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var IsSingleSourceModeInterface
@@ -55,7 +55,7 @@ class SourceItems extends AbstractModifier
private $canManageSourceItemsBySku;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param LocatorInterface $locator
* @param CollectionFactory $sourceItemCollectionFactory
@@ -63,14 +63,14 @@ class SourceItems extends AbstractModifier
* @param CanManageSourceItemsBySku $canManageSourceItemsBySku
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
IsSingleSourceModeInterface $isSingleSourceMode,
LocatorInterface $locator,
CollectionFactory $sourceItemCollectionFactory,
ResourceConnection $resourceConnection,
CanManageSourceItemsBySku $canManageSourceItemsBySku
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->locator = $locator;
$this->sourceItemCollectionFactory = $sourceItemCollectionFactory;
@@ -86,7 +86,7 @@ public function modifyData(array $data)
$product = $this->locator->getProduct();
if ($this->isSingleSourceMode->execute() === true
- || $this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false
+ || $this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false
|| null === $product->getId()
) {
return $data;
@@ -135,7 +135,7 @@ public function modifyMeta(array $meta)
$product = $this->locator->getProduct();
if ($this->isSingleSourceMode->execute() === true
- || $this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
+ || $this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false) {
return $meta;
}
diff --git a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/StockStatus.php b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/StockStatus.php
index e4117257ed236..d15fb3cd78ff5 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/StockStatus.php
+++ b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Form/Modifier/StockStatus.php
@@ -11,7 +11,7 @@
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Framework\Stdlib\ArrayManager;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* StockStatus modifier on CatalogInventory Product Editing Form
@@ -34,27 +34,27 @@ class StockStatus extends AbstractModifier
private $locator;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* CatalogInventory constructor.
* @param ArrayManager $arrayManager
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param LocatorInterface $locator
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
*/
public function __construct(
ArrayManager $arrayManager,
IsSingleSourceModeInterface $isSingleSourceMode,
LocatorInterface $locator,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
) {
$this->arrayManager = $arrayManager;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->locator = $locator;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
}
/**
@@ -78,7 +78,7 @@ public function modifyMeta(array $meta)
$product = $this->locator->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false) {
return $meta;
}
diff --git a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Listing/Modifier/QuantityPerSource.php b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Listing/Modifier/QuantityPerSource.php
index 1ed2344b417fb..5704f68caf390 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Listing/Modifier/QuantityPerSource.php
+++ b/app/code/Magento/InventoryCatalogAdminUi/Ui/DataProvider/Product/Listing/Modifier/QuantityPerSource.php
@@ -12,7 +12,7 @@
use Magento\Inventory\Model\SourceItem\Command\GetSourceItemsBySkuInterface;
use Magento\InventoryApi\Api\SourceRepositoryInterface;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\Ui\Component\Form\Element\DataType\Text;
use Magento\Ui\Component\Listing\Columns\Column;
@@ -27,9 +27,9 @@ class QuantityPerSource extends AbstractModifier
private $isSingleSourceMode;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var SourceRepositoryInterface
@@ -43,18 +43,18 @@ class QuantityPerSource extends AbstractModifier
/**
* @param IsSingleSourceModeInterface $isSingleSourceMode
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param SourceRepositoryInterface $sourceRepository
* @param GetSourceItemsBySkuInterface $getSourceItemsBySku
*/
public function __construct(
IsSingleSourceModeInterface $isSingleSourceMode,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
SourceRepositoryInterface $sourceRepository,
GetSourceItemsBySkuInterface $getSourceItemsBySku
) {
$this->isSingleSourceMode = $isSingleSourceMode;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->sourceRepository = $sourceRepository;
$this->getSourceItemsBySku = $getSourceItemsBySku;
}
@@ -69,9 +69,9 @@ public function modifyData(array $data)
}
foreach ($data['items'] as &$item) {
- $item['quantity_per_source'] = $this->isSourceItemsAllowedForProductType->execute($item['type_id']) === true
- ? $this->getSourceItemsData($item['sku'])
- : [];
+ $item['quantity_per_source'] = $this->isSourceItemManagementAllowedForProductType->execute(
+ $item['type_id']
+ ) === true ? $this->getSourceItemsData($item['sku']) : [];
}
unset($item);
diff --git a/app/code/Magento/InventoryCatalogAdminUi/composer.json b/app/code/Magento/InventoryCatalogAdminUi/composer.json
index ebfd4035d006b..ddc1ab854c13f 100644
--- a/app/code/Magento/InventoryCatalogAdminUi/composer.json
+++ b/app/code/Magento/InventoryCatalogAdminUi/composer.json
@@ -10,7 +10,6 @@
"magento/module-inventory-api": "*",
"magento/module-ui": "*",
"magento/module-inventory-catalog-api": "*",
- "magento/module-inventory-configuration": "*",
"magento/module-inventory-configuration-api": "*",
"magento/module-inventory-indexer": "*"
},
diff --git a/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItems.php b/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemManagement.php
similarity index 77%
rename from app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItems.php
rename to app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemManagement.php
index 5bff602e6192e..6e8f7a96bdbec 100644
--- a/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItems.php
+++ b/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemManagement.php
@@ -8,11 +8,12 @@
namespace Magento\InventoryConfiguration\Model;
use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\InventoryConfigurationApi\Model\GetAllowedProductTypesForSourceItemManagementInterface;
/**
* @inheritdoc
*/
-class GetAllowedProductTypesForSourceItems implements GetAllowedProductTypesForSourceItemsInterface
+class GetAllowedProductTypesForSourceItemManagement implements GetAllowedProductTypesForSourceItemManagementInterface
{
/**
* @var StockConfigurationInterface
diff --git a/app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductType.php b/app/code/Magento/InventoryConfiguration/Model/IsSourceItemManagementAllowedForProductType.php
similarity index 79%
rename from app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductType.php
rename to app/code/Magento/InventoryConfiguration/Model/IsSourceItemManagementAllowedForProductType.php
index 9510d4503cd21..3760a310bc3af 100644
--- a/app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductType.php
+++ b/app/code/Magento/InventoryConfiguration/Model/IsSourceItemManagementAllowedForProductType.php
@@ -8,11 +8,12 @@
namespace Magento\InventoryConfiguration\Model;
use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* @inheritdoc
*/
-class IsSourceItemsAllowedForProductType implements IsSourceItemsAllowedForProductTypeInterface
+class IsSourceItemManagementAllowedForProductType implements IsSourceItemManagementAllowedForProductTypeInterface
{
/**
* @var StockConfigurationInterface
diff --git a/app/code/Magento/InventoryConfiguration/etc/di.xml b/app/code/Magento/InventoryConfiguration/etc/di.xml
index 7afdeb99b0d89..81e2c9653d5d0 100644
--- a/app/code/Magento/InventoryConfiguration/etc/di.xml
+++ b/app/code/Magento/InventoryConfiguration/etc/di.xml
@@ -13,6 +13,6 @@
-
-
+
+
diff --git a/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemsInterface.php b/app/code/Magento/InventoryConfigurationApi/Model/GetAllowedProductTypesForSourceItemManagementInterface.php
similarity index 71%
rename from app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemsInterface.php
rename to app/code/Magento/InventoryConfigurationApi/Model/GetAllowedProductTypesForSourceItemManagementInterface.php
index bc7a32f6e5c05..554e4ae2596d4 100644
--- a/app/code/Magento/InventoryConfiguration/Model/GetAllowedProductTypesForSourceItemsInterface.php
+++ b/app/code/Magento/InventoryConfigurationApi/Model/GetAllowedProductTypesForSourceItemManagementInterface.php
@@ -5,14 +5,14 @@
*/
declare(strict_types=1);
-namespace Magento\InventoryConfiguration\Model;
+namespace Magento\InventoryConfigurationApi\Model;
/**
* Get allowed product types for source items management
*
* @api
*/
-interface GetAllowedProductTypesForSourceItemsInterface
+interface GetAllowedProductTypesForSourceItemManagementInterface
{
/**
* @return array
diff --git a/app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductTypeInterface.php b/app/code/Magento/InventoryConfigurationApi/Model/IsSourceItemManagementAllowedForProductTypeInterface.php
similarity index 60%
rename from app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductTypeInterface.php
rename to app/code/Magento/InventoryConfigurationApi/Model/IsSourceItemManagementAllowedForProductTypeInterface.php
index 57a118a722e70..62726e0717222 100644
--- a/app/code/Magento/InventoryConfiguration/Model/IsSourceItemsAllowedForProductTypeInterface.php
+++ b/app/code/Magento/InventoryConfigurationApi/Model/IsSourceItemManagementAllowedForProductTypeInterface.php
@@ -5,14 +5,14 @@
*/
declare(strict_types=1);
-namespace Magento\InventoryConfiguration\Model;
+namespace Magento\InventoryConfigurationApi\Model;
/**
- * Is allowed management of source items for specific product type
+ * Is allowed management of source items for specific product type
*
* @api
*/
-interface IsSourceItemsAllowedForProductTypeInterface
+interface IsSourceItemManagementAllowedForProductTypeInterface
{
/**
* @param string $productType
diff --git a/app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableGroupedTypePlugin.php b/app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableGroupedTypePlugin.php
similarity index 71%
rename from app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableGroupedTypePlugin.php
rename to app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableGroupedTypePlugin.php
index 18f7c60bd65da..06f6f930bd29f 100644
--- a/app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemsAllowedForProductType/DisableGroupedTypePlugin.php
+++ b/app/code/Magento/InventoryGroupedProduct/Plugin/InventoryConfiguration/IsSourceItemManagementAllowedForProductType/DisableGroupedTypePlugin.php
@@ -5,10 +5,10 @@
*/
declare(strict_types=1);
-namespace Magento\InventoryGroupedProduct\Plugin\InventoryConfiguration\IsSourceItemsAllowedForProductType;
+namespace Magento\InventoryGroupedProduct\Plugin\InventoryConfiguration\IsSourceItemManagementAllowedForProductType;
use Magento\GroupedProduct\Model\Product\Type\Grouped;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Disable Source items management for grouped product type.
@@ -16,14 +16,14 @@
class DisableGroupedTypePlugin
{
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $subject
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $subject
* @param callable $proceed
* @param string $productType
* @return bool
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function aroundExecute(
- IsSourceItemsAllowedForProductTypeInterface $subject,
+ IsSourceItemManagementAllowedForProductTypeInterface $subject,
callable $proceed,
string $productType
): bool {
diff --git a/app/code/Magento/InventoryGroupedProduct/composer.json b/app/code/Magento/InventoryGroupedProduct/composer.json
index e7440eef697f8..e83ed632db6cf 100644
--- a/app/code/Magento/InventoryGroupedProduct/composer.json
+++ b/app/code/Magento/InventoryGroupedProduct/composer.json
@@ -7,7 +7,7 @@
"magento/module-grouped-product": "*"
},
"suggest": {
- "magento/module-inventory-configuration": "*"
+ "magento/module-inventory-configuration-api": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/InventoryGroupedProduct/etc/di.xml b/app/code/Magento/InventoryGroupedProduct/etc/di.xml
index 2793ef5142c83..c7f34a8eae7e6 100644
--- a/app/code/Magento/InventoryGroupedProduct/etc/di.xml
+++ b/app/code/Magento/InventoryGroupedProduct/etc/di.xml
@@ -6,8 +6,8 @@
*/
-->
-
+
+ type="Magento\InventoryGroupedProduct\Plugin\InventoryConfiguration\IsSourceItemManagementAllowedForProductType\DisableGroupedTypePlugin"/>
diff --git a/app/code/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php b/app/code/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php
index f6e339d315c08..d148589804c62 100644
--- a/app/code/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php
+++ b/app/code/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php
@@ -22,7 +22,7 @@
use Magento\Inventory\Model\SourceItem as SourceItemModel;
use Magento\InventoryApi\Api\Data\SourceInterface;
use Magento\InventoryApi\Api\Data\SourceItemInterface;
-use Magento\InventoryConfiguration\Model\GetAllowedProductTypesForSourceItemsInterface;
+use Magento\InventoryConfigurationApi\Model\GetAllowedProductTypesForSourceItemManagementInterface;
use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
use Magento\Store\Model\Store;
use Psr\Log\LoggerInterface;
@@ -38,9 +38,9 @@ class LowQuantityCollection extends AbstractCollection
private $stockConfiguration;
/**
- * @var GetAllowedProductTypesForSourceItemsInterface
+ * @var GetAllowedProductTypesForSourceItemManagementInterface
*/
- private $getAllowedProductTypesForSourceItems;
+ private $getAllowedProductTypesForSourceItemManagement;
/**
* @var AttributeRepositoryInterface
@@ -64,7 +64,7 @@ class LowQuantityCollection extends AbstractCollection
* @param ManagerInterface $eventManager
* @param AttributeRepositoryInterface $attributeRepository
* @param StockConfigurationInterface $stockConfiguration
- * @param GetAllowedProductTypesForSourceItemsInterface $getAllowedProductTypesForSourceItems
+ * @param GetAllowedProductTypesForSourceItemManagementInterface $getAllowedProductTypesForSourceItemManagement
* @param MetadataPool $metadataPool
* @param AdapterInterface|null $connection
* @param AbstractDb|null $resource
@@ -78,7 +78,7 @@ public function __construct(
ManagerInterface $eventManager,
AttributeRepositoryInterface $attributeRepository,
StockConfigurationInterface $stockConfiguration,
- GetAllowedProductTypesForSourceItemsInterface $getAllowedProductTypesForSourceItems,
+ GetAllowedProductTypesForSourceItemManagementInterface $getAllowedProductTypesForSourceItemManagement,
MetadataPool $metadataPool,
AdapterInterface $connection = null,
AbstractDb $resource = null
@@ -94,7 +94,7 @@ public function __construct(
$this->attributeRepository = $attributeRepository;
$this->stockConfiguration = $stockConfiguration;
- $this->getAllowedProductTypesForSourceItems = $getAllowedProductTypesForSourceItems;
+ $this->getAllowedProductTypesForSourceItemManagement = $getAllowedProductTypesForSourceItemManagement;
$this->metadataPool = $metadataPool;
}
@@ -218,7 +218,10 @@ private function joinInventoryConfiguration()
*/
private function addProductTypeFilter()
{
- $this->addFieldToFilter('product_entity.type_id', $this->getAllowedProductTypesForSourceItems->execute());
+ $this->addFieldToFilter(
+ 'product_entity.type_id',
+ $this->getAllowedProductTypesForSourceItemManagement->execute()
+ );
}
/**
diff --git a/app/code/Magento/InventoryLowQuantityNotification/Observer/ProcessSourceItemConfigurationsObserver.php b/app/code/Magento/InventoryLowQuantityNotification/Observer/ProcessSourceItemConfigurationsObserver.php
index f8f5f5a8e6bc1..83b2aabb3acac 100644
--- a/app/code/Magento/InventoryLowQuantityNotification/Observer/ProcessSourceItemConfigurationsObserver.php
+++ b/app/code/Magento/InventoryLowQuantityNotification/Observer/ProcessSourceItemConfigurationsObserver.php
@@ -11,7 +11,7 @@
use Magento\Catalog\Controller\Adminhtml\Product\Save;
use Magento\Framework\Event\ObserverInterface;
use Magento\Framework\Event\Observer as EventObserver;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Save source relations (configuration) during product persistence via controller
@@ -22,9 +22,9 @@
class ProcessSourceItemConfigurationsObserver implements ObserverInterface
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var SourceItemsConfigurationProcessor
@@ -32,14 +32,14 @@ class ProcessSourceItemConfigurationsObserver implements ObserverInterface
private $sourceItemsConfigurationProcessor;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param SourceItemsConfigurationProcessor $sourceItemsConfigurationProcessor
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
SourceItemsConfigurationProcessor $sourceItemsConfigurationProcessor
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->sourceItemsConfigurationProcessor = $sourceItemsConfigurationProcessor;
}
@@ -51,7 +51,7 @@ public function execute(EventObserver $observer)
{
/** @var ProductInterface $product */
$product = $observer->getEvent()->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false) {
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false) {
return;
}
diff --git a/app/code/Magento/InventoryLowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php b/app/code/Magento/InventoryLowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php
index da17fd09d266d..acc182ab015af 100644
--- a/app/code/Magento/InventoryLowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php
+++ b/app/code/Magento/InventoryLowQuantityNotification/Ui/DataProvider/Product/Form/Modifier/SourceItemConfiguration.php
@@ -12,7 +12,7 @@
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\InventoryApi\Api\Data\SourceInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventoryLowQuantityNotificationApi\Api\GetSourceItemConfigurationInterface;
use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
@@ -22,9 +22,9 @@
class SourceItemConfiguration extends AbstractModifier
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var LocatorInterface
@@ -42,18 +42,18 @@ class SourceItemConfiguration extends AbstractModifier
private $scopeConfig;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param LocatorInterface $locator
* @param GetSourceItemConfigurationInterface $getSourceItemConfiguration
* @param ScopeConfigInterface $scopeConfig
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
LocatorInterface $locator,
GetSourceItemConfigurationInterface $getSourceItemConfiguration,
ScopeConfigInterface $scopeConfig
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->locator = $locator;
$this->getSourceItemConfiguration = $getSourceItemConfiguration;
$this->scopeConfig = $scopeConfig;
@@ -65,7 +65,7 @@ public function __construct(
public function modifyData(array $data)
{
$product = $this->locator->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false
|| null === $product->getId()
|| !isset($data[$product->getId()]['sources']['assigned_sources'])
) {
diff --git a/app/code/Magento/InventoryLowQuantityNotification/composer.json b/app/code/Magento/InventoryLowQuantityNotification/composer.json
index 4053143789f3b..24ae73c049966 100644
--- a/app/code/Magento/InventoryLowQuantityNotification/composer.json
+++ b/app/code/Magento/InventoryLowQuantityNotification/composer.json
@@ -12,7 +12,7 @@
"magento/module-inventory": "*",
"magento/module-inventory-api": "*",
"magento/module-inventory-catalog-api": "*",
- "magento/module-inventory-configuration": "*",
+ "magento/module-inventory-configuration-api": "*",
"magento/module-inventory-low-quantity-notification-api": "*",
"magento/module-store": "*",
"magento/module-ui": "*"
diff --git a/app/code/Magento/InventorySales/Model/CheckItemsQuantity.php b/app/code/Magento/InventorySales/Model/CheckItemsQuantity.php
index 58d29086fbad3..08d1a97f5e44a 100644
--- a/app/code/Magento/InventorySales/Model/CheckItemsQuantity.php
+++ b/app/code/Magento/InventorySales/Model/CheckItemsQuantity.php
@@ -10,7 +10,7 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
use Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventorySalesApi\Api\Data\ProductSalableResultInterface;
use Magento\InventorySalesApi\Api\Data\ProductSalabilityErrorInterface;
use Magento\InventoryCatalogApi\Api\DefaultStockProviderInterface;
@@ -18,9 +18,9 @@
class CheckItemsQuantity
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var IsProductSalableForRequestedQtyInterface
@@ -38,18 +38,18 @@ class CheckItemsQuantity
private $getProductTypesBySkus;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty
* @param DefaultStockProviderInterface $defaultStockProvider
* @param GetProductTypesBySkusInterface $getProductTypesBySkus
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty,
DefaultStockProviderInterface $defaultStockProvider,
GetProductTypesBySkusInterface $getProductTypesBySkus
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->isProductSalableForRequestedQty = $isProductSalableForRequestedQty;
$this->defaultStockProvider = $defaultStockProvider;
$this->getProductTypesBySkus = $getProductTypesBySkus;
@@ -67,7 +67,7 @@ public function execute(array $items, int $stockId) : void
{
$productTypes = $this->getProductTypesBySkus->execute(array_keys($items));
foreach ($items as $sku => $qty) {
- if (false === $this->isSourceItemsAllowedForProductType->execute($productTypes[$sku])) {
+ if (false === $this->isSourceItemManagementAllowedForProductType->execute($productTypes[$sku])) {
$defaultStockId = $this->defaultStockProvider->getId();
if ($defaultStockId !== $stockId) {
throw new LocalizedException(
diff --git a/app/code/Magento/InventorySales/Model/IsProductSalableCondition/IsSalableWithReservationsCondition.php b/app/code/Magento/InventorySales/Model/IsProductSalableCondition/IsSalableWithReservationsCondition.php
index f662249356552..7b2d3206384fe 100644
--- a/app/code/Magento/InventorySales/Model/IsProductSalableCondition/IsSalableWithReservationsCondition.php
+++ b/app/code/Magento/InventorySales/Model/IsProductSalableCondition/IsSalableWithReservationsCondition.php
@@ -8,7 +8,7 @@
namespace Magento\InventorySales\Model\IsProductSalableCondition;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductType;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventoryConfigurationApi\Api\Data\StockItemConfigurationInterface;
use Magento\InventoryReservationsApi\Model\GetReservationsQuantityInterface;
use Magento\InventorySalesApi\Api\IsProductSalableInterface;
@@ -36,9 +36,9 @@ class IsSalableWithReservationsCondition implements IsProductSalableInterface
private $getStockItemConfiguration;
/**
- * @var IsSourceItemsAllowedForProductType
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var GetProductTypesBySkusInterface
@@ -49,20 +49,20 @@ class IsSalableWithReservationsCondition implements IsProductSalableInterface
* @param GetStockItemDataInterface $getStockItemData
* @param GetReservationsQuantityInterface $getReservationsQuantity
* @param GetStockItemConfigurationInterface $getStockItemConfiguration
- * @param IsSourceItemsAllowedForProductType $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param GetProductTypesBySkusInterface $getProductTypesBySkus
*/
public function __construct(
GetStockItemDataInterface $getStockItemData,
GetReservationsQuantityInterface $getReservationsQuantity,
GetStockItemConfigurationInterface $getStockItemConfiguration,
- IsSourceItemsAllowedForProductType $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
GetProductTypesBySkusInterface $getProductTypesBySkus
) {
$this->getStockItemData = $getStockItemData;
$this->getReservationsQuantity = $getReservationsQuantity;
$this->getStockItemConfiguration = $getStockItemConfiguration;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->getProductTypesBySkus = $getProductTypesBySkus;
}
@@ -78,7 +78,7 @@ public function execute(string $sku, int $stockId): bool
}
$productType = $this->getProductTypesBySkus->execute([$sku])[$sku];
- if (false === $this->isSourceItemsAllowedForProductType->execute($productType)) {
+ if (false === $this->isSourceItemManagementAllowedForProductType->execute($productType)) {
return (bool)$stockItemData[GetStockItemDataInterface::IS_SALABLE];
}
diff --git a/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php b/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php
index 02ef12a4a26cd..74e5a027dc2c6 100644
--- a/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php
+++ b/app/code/Magento/InventorySales/Model/PlaceReservationsForSalesEvent.php
@@ -14,7 +14,7 @@
use Magento\InventorySalesApi\Api\Data\SalesEventInterface;
use Magento\InventorySalesApi\Api\PlaceReservationsForSalesEventInterface;
use Magento\InventorySalesApi\Api\StockResolverInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
/**
@@ -43,29 +43,29 @@ class PlaceReservationsForSalesEvent implements PlaceReservationsForSalesEventIn
private $getProductTypesBySkus;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @param ReservationBuilderInterface $reservationBuilder
* @param AppendReservationsInterface $appendReservations
* @param StockResolverInterface $stockResolver
* @param GetProductTypesBySkusInterface $getProductTypesBySkus
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
*/
public function __construct(
ReservationBuilderInterface $reservationBuilder,
AppendReservationsInterface $appendReservations,
StockResolverInterface $stockResolver,
GetProductTypesBySkusInterface $getProductTypesBySkus,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
) {
$this->reservationBuilder = $reservationBuilder;
$this->appendReservations = $appendReservations;
$this->stockResolver = $stockResolver;
$this->getProductTypesBySkus = $getProductTypesBySkus;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
}
/**
@@ -89,7 +89,7 @@ public function execute(array $items, SalesChannelInterface $salesChannel, Sales
$reservations = [];
/** @var ItemToSellInterface $item */
foreach ($items as $item) {
- if (true === $this->isSourceItemsAllowedForProductType->execute($productTypes[$item->getSku()])) {
+ if (true === $this->isSourceItemManagementAllowedForProductType->execute($productTypes[$item->getSku()])) {
$reservations[] = $this->reservationBuilder
->setSku($item->getSku())
->setQuantity((float)$item->getQuantity())
diff --git a/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php b/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php
index 686907f7bdb26..503178896243c 100644
--- a/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php
+++ b/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessBackItemQtyPlugin.php
@@ -11,7 +11,7 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
@@ -42,9 +42,9 @@ class ProcessBackItemQtyPlugin
private $appendReservations;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var GetProductTypesBySkusInterface
@@ -56,7 +56,7 @@ class ProcessBackItemQtyPlugin
* @param StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver
* @param ReservationBuilderInterface $reservationBuilder
* @param AppendReservationsInterface $appendReservations
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param GetProductTypesBySkusInterface $getProductTypesBySkus
*/
public function __construct(
@@ -64,14 +64,14 @@ public function __construct(
StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver,
ReservationBuilderInterface $reservationBuilder,
AppendReservationsInterface $appendReservations,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
GetProductTypesBySkusInterface $getProductTypesBySkus
) {
$this->getSkusByProductIds = $getSkusByProductIds;
$this->stockByWebsiteIdResolver = $stockByWebsiteIdResolver;
$this->reservationBuilder = $reservationBuilder;
$this->appendReservations = $appendReservations;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->getProductTypesBySkus = $getProductTypesBySkus;
}
@@ -95,7 +95,7 @@ public function aroundBackItemQty(StockManagement $subject, callable $proceed, $
$productSku = $this->getSkusByProductIds->execute([$productId])[$productId];
$productType = $this->getProductTypesBySkus->execute([$productSku])[$productSku];
- if (true === $this->isSourceItemsAllowedForProductType->execute($productType)) {
+ if (true === $this->isSourceItemManagementAllowedForProductType->execute($productType)) {
$stockId = (int)$this->stockByWebsiteIdResolver->execute((int)$scopeId)->getStockId();
$reservation = $this->reservationBuilder
->setSku($productSku)
diff --git a/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php b/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php
index 3ddd119ea1a43..a4e00fe3df92c 100644
--- a/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php
+++ b/app/code/Magento/InventorySales/Plugin/CatalogInventory/StockManagement/ProcessRevertProductsSalePlugin.php
@@ -12,7 +12,7 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\InventoryCatalogApi\Model\GetProductTypesBySkusInterface;
use Magento\InventoryCatalogApi\Model\GetSkusByProductIdsInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
use Magento\InventorySalesApi\Model\StockByWebsiteIdResolverInterface;
@@ -43,9 +43,9 @@ class ProcessRevertProductsSalePlugin
private $appendReservations;
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var GetProductTypesBySkusInterface
@@ -57,7 +57,7 @@ class ProcessRevertProductsSalePlugin
* @param StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver
* @param ReservationBuilderInterface $reservationBuilder
* @param AppendReservationsInterface $appendReservations
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param GetProductTypesBySkusInterface $getProductTypesBySkus
*/
public function __construct(
@@ -65,14 +65,14 @@ public function __construct(
StockByWebsiteIdResolverInterface $stockByWebsiteIdResolver,
ReservationBuilderInterface $reservationBuilder,
AppendReservationsInterface $appendReservations,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
GetProductTypesBySkusInterface $getProductTypesBySkus
) {
$this->getSkusByProductIds = $getSkusByProductIds;
$this->stockByWebsiteIdResolver = $stockByWebsiteIdResolver;
$this->reservationBuilder = $reservationBuilder;
$this->appendReservations = $appendReservations;
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->getProductTypesBySkus = $getProductTypesBySkus;
}
@@ -100,7 +100,7 @@ public function aroundRevertProductsSale(StockManagement $subject, callable $pro
$reservations = [];
foreach ($productSkus as $productId => $sku) {
- if (false === $this->isSourceItemsAllowedForProductType->execute($productTypes[$sku])) {
+ if (false === $this->isSourceItemManagementAllowedForProductType->execute($productTypes[$sku])) {
continue;
}
$reservations[] = $this->reservationBuilder
diff --git a/app/code/Magento/InventorySales/composer.json b/app/code/Magento/InventorySales/composer.json
index a0e5d606c291a..bc90304957a90 100644
--- a/app/code/Magento/InventorySales/composer.json
+++ b/app/code/Magento/InventorySales/composer.json
@@ -8,7 +8,6 @@
"magento/module-catalog": "*",
"magento/module-inventory-api": "*",
"magento/module-inventory-catalog-api": "*",
- "magento/module-inventory-configuration": "*",
"magento/module-inventory-configuration-api": "*",
"magento/module-inventory-reservations-api": "*",
"magento/module-inventory-sales-api": "*",
diff --git a/app/code/Magento/InventorySalesAdminUi/Ui/Component/Listing/Column/SalableQuantity.php b/app/code/Magento/InventorySalesAdminUi/Ui/Component/Listing/Column/SalableQuantity.php
index 092e566dca6aa..bc604896b35f4 100644
--- a/app/code/Magento/InventorySalesAdminUi/Ui/Component/Listing/Column/SalableQuantity.php
+++ b/app/code/Magento/InventorySalesAdminUi/Ui/Component/Listing/Column/SalableQuantity.php
@@ -11,7 +11,7 @@
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\InventorySalesAdminUi\Model\GetSalableQuantityDataBySku;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
use Magento\Ui\Component\Listing\Columns\Column;
/**
@@ -20,9 +20,9 @@
class SalableQuantity extends Column
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var IsSingleSourceModeInterface
@@ -37,7 +37,7 @@ class SalableQuantity extends Column
/**
* @param ContextInterface $context
* @param UiComponentFactory $uiComponentFactory
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param GetSalableQuantityDataBySku $getSalableQuantityDataBySku
* @param array $components
@@ -46,14 +46,14 @@ class SalableQuantity extends Column
public function __construct(
ContextInterface $context,
UiComponentFactory $uiComponentFactory,
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
IsSingleSourceModeInterface $isSingleSourceMode,
GetSalableQuantityDataBySku $getSalableQuantityDataBySku,
array $components = [],
array $data = []
) {
parent::__construct($context, $uiComponentFactory, $components, $data);
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->getSalableQuantityDataBySku = $getSalableQuantityDataBySku;
}
@@ -66,7 +66,7 @@ public function prepareDataSource(array $dataSource)
if ($dataSource['data']['totalRecords'] > 0) {
foreach ($dataSource['data']['items'] as &$row) {
$row['salable_quantity'] =
- $this->isSourceItemsAllowedForProductType->execute($row['type_id']) === true
+ $this->isSourceItemManagementAllowedForProductType->execute($row['type_id']) === true
? $this->getSalableQuantityDataBySku->execute($row['sku'])
: [];
}
diff --git a/app/code/Magento/InventorySalesAdminUi/Ui/DataProvider/Product/Form/Modifier/SalableQuantity.php b/app/code/Magento/InventorySalesAdminUi/Ui/DataProvider/Product/Form/Modifier/SalableQuantity.php
index aa08e0e2cb488..fd68398f9d25b 100644
--- a/app/code/Magento/InventorySalesAdminUi/Ui/DataProvider/Product/Form/Modifier/SalableQuantity.php
+++ b/app/code/Magento/InventorySalesAdminUi/Ui/DataProvider/Product/Form/Modifier/SalableQuantity.php
@@ -11,7 +11,7 @@
use Magento\Catalog\Model\Locator\LocatorInterface;
use Magento\InventorySalesAdminUi\Model\GetSalableQuantityDataBySku;
use Magento\InventoryCatalogApi\Model\IsSingleSourceModeInterface;
-use Magento\InventoryConfiguration\Model\IsSourceItemsAllowedForProductTypeInterface;
+use Magento\InventoryConfigurationApi\Model\IsSourceItemManagementAllowedForProductTypeInterface;
/**
* Product form modifier. Modify form stocks declaration
@@ -19,9 +19,9 @@
class SalableQuantity extends AbstractModifier
{
/**
- * @var IsSourceItemsAllowedForProductTypeInterface
+ * @var IsSourceItemManagementAllowedForProductTypeInterface
*/
- private $isSourceItemsAllowedForProductType;
+ private $isSourceItemManagementAllowedForProductType;
/**
* @var LocatorInterface
@@ -39,18 +39,18 @@ class SalableQuantity extends AbstractModifier
private $getSalableQuantityDataBySku;
/**
- * @param IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType
+ * @param IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType
* @param LocatorInterface $locator
* @param IsSingleSourceModeInterface $isSingleSourceMode
* @param GetSalableQuantityDataBySku $getSalableQuantityDataBySku
*/
public function __construct(
- IsSourceItemsAllowedForProductTypeInterface $isSourceItemsAllowedForProductType,
+ IsSourceItemManagementAllowedForProductTypeInterface $isSourceItemManagementAllowedForProductType,
LocatorInterface $locator,
IsSingleSourceModeInterface $isSingleSourceMode,
GetSalableQuantityDataBySku $getSalableQuantityDataBySku
) {
- $this->isSourceItemsAllowedForProductType = $isSourceItemsAllowedForProductType;
+ $this->isSourceItemManagementAllowedForProductType = $isSourceItemManagementAllowedForProductType;
$this->locator = $locator;
$this->isSingleSourceMode = $isSingleSourceMode;
$this->getSalableQuantityDataBySku = $getSalableQuantityDataBySku;
@@ -63,7 +63,7 @@ public function modifyData(array $data)
{
$product = $this->locator->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false
|| null === $product->getId()
) {
return $data;
@@ -80,7 +80,7 @@ public function modifyMeta(array $meta)
{
$product = $this->locator->getProduct();
- if ($this->isSourceItemsAllowedForProductType->execute($product->getTypeId()) === false
+ if ($this->isSourceItemManagementAllowedForProductType->execute($product->getTypeId()) === false
|| null === $product->getId()
) {
return $meta;
diff --git a/app/code/Magento/InventorySalesAdminUi/composer.json b/app/code/Magento/InventorySalesAdminUi/composer.json
index 11e88d6eb5724..c696fee1116d1 100644
--- a/app/code/Magento/InventorySalesAdminUi/composer.json
+++ b/app/code/Magento/InventorySalesAdminUi/composer.json
@@ -11,7 +11,7 @@
"magento/module-inventory-catalog-api": "*",
"magento/module-inventory-sales": "*",
"magento/module-inventory-sales-api": "*",
- "magento/module-inventory-configuration": "*",
+ "magento/module-inventory-configuration-api": "*",
"magento/module-catalog": "*",
"magento/module-store": "*",
"magento/module-ui": "*"