Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions InventorySales/Plugin/Quote/Api/ValidateQtyBeforeSave.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\InventorySales\Plugin\Quote\Api;

use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator;
use Magento\Framework\Event;
use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverFactory;
use Magento\Framework\Exception\LocalizedException;
use Magento\Quote\Api\CartItemRepositoryInterface;
use Magento\Quote\Api\Data\CartItemInterface;

/**
* Validate item qty before save.
*/
class ValidateQtyBeforeSave
{
/**
* @var QuantityValidator
*/
private $validator;

/**
* @var ObserverFactory
*/
private $observerFactory;

/**
* @param QuantityValidator $validator
* @param ObserverFactory $observerFactory
*/
public function __construct(QuantityValidator $validator, ObserverFactory $observerFactory)
{
$this->validator = $validator;
$this->observerFactory = $observerFactory;
}

/**
* @param CartItemRepositoryInterface $subject
* @param CartItemInterface $item
*
* @return array
* @throws LocalizedException
*/
public function beforeSave(CartItemRepositoryInterface $subject, CartItemInterface $item): array
{
/** @var Event $event */
$event = $this->observerFactory->create(Event::class, ['data' => ['item' => $item]]);
/** @var Observer $observer */
$observer = $this->observerFactory->create(Observer::class, ['data' => ['event' => $event]]);

$this->validator->validate($observer);

if (!empty($item->getMessage()) && $item->getHasError()) {
throw new LocalizedException(__($item->getMessage()));
}

return [$item];
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\InventorySales\Plugin\Quote\Model\Quote\Item\CartItemPersister;

use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator;
use Magento\Framework\Event;
use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverFactory;
use Magento\Framework\Exception\LocalizedException;
use Magento\Quote\Api\Data\CartInterface;
use Magento\Quote\Api\Data\CartItemInterface;
use Magento\Quote\Model\Quote\Item\CartItemPersister;

/**
* Validate qty before persist.
*/
class ValidateQtyBeforePersist
{
/**
* @var QuantityValidator
*/
private $qtyValidator;
/**
* @var ObserverFactory
*/
private $observerFactory;

/**
* @param QuantityValidator $validator
* @param ObserverFactory $observerFactory
*/
public function __construct(QuantityValidator $validator, ObserverFactory $observerFactory)
{
$this->qtyValidator = $validator;
$this->observerFactory = $observerFactory;
}

/**
* Validate item qty before save.
*
* @param CartItemPersister $subject
* @param CartInterface $quote
* @param CartItemInterface $item
*
* @return array
* @throws LocalizedException
*
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function beforeSave(CartItemPersister $subject, CartInterface $quote, CartItemInterface $item): array
{
/** @var Event $event */
$event = $this->observerFactory->create(Event::class, ['data' => ['item' => $item]]);
/** @var Observer $observer */
$observer = $this->observerFactory->create(Observer::class, ['data' => ['event' => $event]]);

$this->qtyValidator->validate($observer);
if (!empty($item->getMessage()) && $item->getHasError()) {
throw new LocalizedException(__($item->getMessage()));
}

return [
$quote,
$item
];
}
}
3 changes: 2 additions & 1 deletion InventorySales/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"magento/module-sales": "*"
},
"suggest": {
"magento/module-inventory-catalog": "*"
"magento/module-inventory-catalog": "*",
"magento/module-quote": "*"
},
"require-dev": {
"magento/module-inventory-indexer": "*"
Expand Down
6 changes: 6 additions & 0 deletions InventorySales/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,10 @@
<preference for="Magento\InventorySalesApi\Api\Data\IsProductSalableForRequestedQtyRequestInterface" type="Magento\InventorySales\Model\IsProductSalableForRequestedQtyRequest"/>
<preference for="Magento\InventorySalesApi\Api\Data\IsProductSalableForRequestedQtyResultInterface" type="Magento\InventorySales\Model\IsProductSalableForRequestedQtyResult"/>
<preference for="Magento\InventorySalesApi\Api\Data\IsProductSalableResultInterface" type="Magento\InventorySales\Model\IsProductSalableResult"/>
<type name="Magento\Quote\Model\Quote\Item\CartItemPersister">
<plugin name="validate_qty_before_save_item" type="Magento\InventorySales\Plugin\Quote\Model\Quote\Item\CartItemPersister\ValidateQtyBeforePersist" />
</type>
<type name="Magento\Quote\Api\CartItemRepositoryInterface">
<plugin name="validate_qty_before_save_item" type="Magento\InventorySales\Plugin\Quote\Model\Quote\Item\CartItemPersister\ValidateQtyBeforePersist" />
</type>
</config>
4 changes: 4 additions & 0 deletions InventorySales/etc/events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@
<event name="sales_model_service_quote_submit_before">
<observer name="inventory" instance="Magento\CatalogInventory\Observer\SubtractQuoteInventoryObserver" disabled="true"/>
</event>

<event name="sales_quote_item_qty_set_after">
<observer name="inventory" instance="Magento\CatalogInventory\Observer\QuantityValidatorObserver" disabled="true" />
</event>
</config>