diff --git a/InventorySales/Model/AreProductsSalableForRequestedQty.php b/InventorySales/Model/AreProductsSalableForRequestedQty.php
index 9a5b92ade1da..128a8170a2d4 100644
--- a/InventorySales/Model/AreProductsSalableForRequestedQty.php
+++ b/InventorySales/Model/AreProductsSalableForRequestedQty.php
@@ -9,8 +9,8 @@
use Magento\Framework\Exception\LocalizedException;
use Magento\InventorySalesApi\Api\AreProductsSalableForRequestedQtyInterface;
-use Magento\InventorySalesApi\Api\Data\AreProductsSalableResultInterface;
-use Magento\InventorySalesApi\Api\Data\AreProductsSalableResultInterfaceFactory;
+use Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterface;
+use Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterfaceFactory;
use Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface;
use Psr\Log\LoggerInterface;
@@ -30,29 +30,29 @@ class AreProductsSalableForRequestedQty implements AreProductsSalableForRequeste
private $logger;
/**
- * @var AreProductsSalableResultInterfaceFactory
+ * @var ProductsSalableResultInterfaceFactory
*/
- private $areProductsSalableResultInterfaceFactory;
+ private $productsSalableResultFactory;
/**
* @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQtyInterface
- * @param AreProductsSalableResultInterfaceFactory $areProductsSalableResultInterfaceFactory
+ * @param ProductsSalableResultInterfaceFactory $productsSalableResultFactory
* @param LoggerInterface $logger
*/
public function __construct(
IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQtyInterface,
- AreProductsSalableResultInterfaceFactory $areProductsSalableResultInterfaceFactory,
+ ProductsSalableResultInterfaceFactory $productsSalableResultFactory,
LoggerInterface $logger
) {
$this->isProductSalableForRequestedQtyInterface = $isProductSalableForRequestedQtyInterface;
$this->logger = $logger;
- $this->areProductsSalableResultInterfaceFactory = $areProductsSalableResultInterfaceFactory;
+ $this->productsSalableResultFactory = $productsSalableResultFactory;
}
/**
* @inheritDoc
*/
- public function execute(array $skuRequests, int $stockId): AreProductsSalableResultInterface
+ public function execute(array $skuRequests, int $stockId): ProductsSalableResultInterface
{
$results = [];
foreach ($skuRequests as $sku => $quantity) {
@@ -67,6 +67,6 @@ public function execute(array $skuRequests, int $stockId): AreProductsSalableRes
}
}
- return $this->areProductsSalableResultInterfaceFactory->create(['results' => $results]);
+ return $this->productsSalableResultFactory->create(['results' => $results]);
}
}
diff --git a/InventorySales/Model/AreProductsSalableForRequestedQty/AreProductSalableResult.php b/InventorySales/Model/AreProductsSalableForRequestedQty/ProductsSalableResult.php
similarity index 78%
rename from InventorySales/Model/AreProductsSalableForRequestedQty/AreProductSalableResult.php
rename to InventorySales/Model/AreProductsSalableForRequestedQty/ProductsSalableResult.php
index 62a35fd3e50a..e4de6b4b0b3f 100644
--- a/InventorySales/Model/AreProductsSalableForRequestedQty/AreProductSalableResult.php
+++ b/InventorySales/Model/AreProductsSalableForRequestedQty/ProductsSalableResult.php
@@ -14,13 +14,13 @@
use Magento\Framework\Model\Context;
use Magento\Framework\Model\ResourceModel\AbstractResource;
use Magento\Framework\Registry;
-use Magento\InventorySalesApi\Api\Data\AreProductsSalableResultExtensionInterface;
-use Magento\InventorySalesApi\Api\Data\AreProductsSalableResultInterface;
+use Magento\InventorySalesApi\Api\Data\ProductsSalableResultExtensionInterface;
+use Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterface;
/**
* @inheritDoc
*/
-class AreProductSalableResult extends AbstractExtensibleModel implements AreProductsSalableResultInterface
+class ProductsSalableResult extends AbstractExtensibleModel implements ProductsSalableResultInterface
{
/**
* @var array
@@ -62,7 +62,7 @@ public function __construct(
/**
* @inheritDoc
*/
- public function getAreSalable(): array
+ public function getSalable(): array
{
return $this->results;
}
@@ -70,7 +70,7 @@ public function getAreSalable(): array
/**
* @inheritDoc
*/
- public function getExtensionAttributes(): ?AreProductsSalableResultExtensionInterface
+ public function getExtensionAttributes(): ?ProductsSalableResultExtensionInterface
{
return $this->_getExtensionAttributes();
}
@@ -78,7 +78,7 @@ public function getExtensionAttributes(): ?AreProductsSalableResultExtensionInte
/**
* @inheritDoc
*/
- public function setExtensionAttributes(AreProductsSalableResultExtensionInterface $extensionAttributes): void
+ public function setExtensionAttributes(ProductsSalableResultExtensionInterface $extensionAttributes): void
{
$this->_setExtensionAttributes($extensionAttributes);
}
diff --git a/InventorySales/Model/CheckItemsQuantity.php b/InventorySales/Model/CheckItemsQuantity.php
index 23de37cdcbfe..c93011fed608 100644
--- a/InventorySales/Model/CheckItemsQuantity.php
+++ b/InventorySales/Model/CheckItemsQuantity.php
@@ -18,27 +18,19 @@
*/
class CheckItemsQuantity
{
- /**
- * @deprecated
- * @see AreProductsSalableForRequestedQty
- * @var IsProductSalableForRequestedQtyInterface
- */
- private $isProductSalableForRequestedQty;
-
/**
* @var AreProductsSalableForRequestedQtyInterface
*/
private $areProductsSalableForRequestedQty;
/**
- * @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty
+ * @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty @deprecated
* @param AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty
*/
public function __construct(
IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty,
AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty = null
) {
- $this->isProductSalableForRequestedQty = $isProductSalableForRequestedQty;
$this->areProductsSalableForRequestedQty = $areProductsSalableForRequestedQty ?: ObjectManager::getInstance()
->get(AreProductsSalableForRequestedQtyInterface::class);
}
@@ -54,7 +46,7 @@ public function __construct(
public function execute(array $items, int $stockId): void
{
$result = $this->areProductsSalableForRequestedQty->execute($items, $stockId);
- foreach ($result->getAreSalable() as $isSalable) {
+ foreach ($result->getSalable() as $isSalable) {
if (false === $isSalable->isSalable()) {
$errors = $isSalable->getErrors();
/** @var ProductSalabilityErrorInterface $errorMessage */
diff --git a/InventorySales/etc/di.xml b/InventorySales/etc/di.xml
index 2b8857a3d9be..0bc642a0a9b4 100644
--- a/InventorySales/etc/di.xml
+++ b/InventorySales/etc/di.xml
@@ -132,15 +132,10 @@
-
+
IsProductSalableForRequestedQtyConditionChainOnPlaceOrder
-
-
-
- AreProductsSalableForRequestedQtyConditionChainOnPlaceOrder
-
@@ -185,5 +180,5 @@
type="Magento\InventoryCatalog\Plugin\InventoryConfigurationApi\GetStockItemConfiguration\LoadIsInStockPlugin"/>
-
+
diff --git a/InventorySalesApi/Api/AreProductsSalableForRequestedQtyInterface.php b/InventorySalesApi/Api/AreProductsSalableForRequestedQtyInterface.php
index 9efbdf7bfcae..a95e0c492f45 100644
--- a/InventorySalesApi/Api/AreProductsSalableForRequestedQtyInterface.php
+++ b/InventorySalesApi/Api/AreProductsSalableForRequestedQtyInterface.php
@@ -7,7 +7,7 @@
namespace Magento\InventorySalesApi\Api;
-use Magento\InventorySalesApi\Api\Data\AreProductsSalableResultInterface;
+use Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterface;
/**
* Service which detects whether a given products quantities are salable for a given stock (stock data + reservations).
@@ -21,7 +21,7 @@ interface AreProductsSalableForRequestedQtyInterface
*
* @param array $skuRequests array('sku' => 'quantity', ..., ...)
* @param int $stockId
- * @return \Magento\InventorySalesApi\Api\Data\AreProductsSalableResultInterface
+ * @return \Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterface
*/
- public function execute(array $skuRequests, int $stockId): AreProductsSalableResultInterface;
+ public function execute(array $skuRequests, int $stockId): ProductsSalableResultInterface;
}
diff --git a/InventorySalesApi/Api/Data/AreProductsSalableResultInterface.php b/InventorySalesApi/Api/Data/AreProductsSalableResultInterface.php
deleted file mode 100644
index 112df285fefe..000000000000
--- a/InventorySalesApi/Api/Data/AreProductsSalableResultInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-