Merge pull request #310 from paynl/feature/PLUG-5017-2

PLUG-5017 - Move proxy to di.xml

Author: woutse

Observer/SubtractInventoryObserver.php

@@ -4,10 +4,11 @@
 
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\InventorySales\Model\ResourceModel\GetAssignedStockIdForWebsite\Proxy as GetAssignedStockIdForWebsiteProxy;
-use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface\Proxy as ReservationBuilderInterfaceProxy;
-use Magento\InventoryReservationsApi\Model\AppendReservationsInterface\Proxy as AppendReservationsInterfaceProxy;
+use Magento\InventorySales\Model\ResourceModel\GetAssignedStockIdForWebsite;
+use Magento\InventoryReservationsApi\Model\ReservationBuilderInterface;
+use Magento\InventoryReservationsApi\Model\AppendReservationsInterface;
 
 class SubtractInventoryObserver implements ObserverInterface
 {
@@ -31,23 +32,31 @@ class SubtractInventoryObserver implements ObserverInterface
      */
     private $appendReservations;
 
+    /**
+     * @var StockRegistryInterface
+     */
+    private $stockRegistry;
+
     /**
      * SubtractInventoryObserver constructor.
      * @param StoreRepositoryInterface $storeRepository
-     * @param GetAssignedStockIdForWebsiteProxy $getAssignedStockIdForWebsite
-     * @param ReservationBuilderInterfaceProxy $reservationBuilder
-     * @param AppendReservationsInterfaceProxy $appendReservations
+     * @param GetAssignedStockIdForWebsite $getAssignedStockIdForWebsite
+     * @param ReservationBuilderInterface $reservationBuilder
+     * @param AppendReservationsInterface $appendReservations
+     * @param StockRegistryInterface $stockRegistry
      */
     public function __construct(
         StoreRepositoryInterface $storeRepository,
-        GetAssignedStockIdForWebsiteProxy $getAssignedStockIdForWebsite,
-        ReservationBuilderInterfaceProxy $reservationBuilder,
-        AppendReservationsInterfaceProxy $appendReservations
+        GetAssignedStockIdForWebsite $getAssignedStockIdForWebsite,
+        ReservationBuilderInterface $reservationBuilder,
+        AppendReservationsInterface $appendReservations,
+        StockRegistryInterface $stockRegistry
     ) {
         $this->storeRepository = $storeRepository;
         $this->getAssignedStockIdForWebsite = $getAssignedStockIdForWebsite;
         $this->reservationBuilder = $reservationBuilder;
         $this->appendReservations = $appendReservations;
+        $this->stockRegistry = $stockRegistry;
     }
 
     /**
@@ -71,11 +80,9 @@ public function execute(EventObserver $observer)
             $storeId = $order->getStoreId();
             $website = $this->storeRepository->getById($storeId)->getWebsite();
             $websiteCode = $website->getCode();
+            $websiteId = $website->getId();
 
-            if (
-                interface_exists(\Magento\InventoryReservationsApi\Model\ReservationBuilderInterface::class)
-                && interface_exists(\Magento\InventoryReservationsApi\Model\AppendReservationsInterface::class)
-            ) {
+            if (class_exists(\Magento\InventorySales\Model\ResourceModel\GetAssignedStockIdForWebsite::class) && class_exists(\Magento\InventoryReservationsApi\Model\ReservationBuilderInterface::class) && class_exists(\Magento\InventoryReservationsApi\Model\AppendReservationsInterface::class)) {
                 $stockId = $this->getAssignedStockIdForWebsite->execute($websiteCode);
                 $reservations = [];
 
@@ -95,7 +102,21 @@ interface_exists(\Magento\InventoryReservationsApi\Model\ReservationBuilderInter
                 }
 
                 $this->appendReservations->execute($reservations);
+            } else {
+                foreach ($order->getAllItems() as $item) {
+                    $itemData = $item->getData();
+
+                    $itemQty = $itemData['qty_ordered'] ?? null;
+                    $itemSku = $itemData['sku'] ?? null;
+
+                    $stockItem = $this->stockRegistry->getStockItemBySku($itemSku, $websiteId);
+                    $currentQty = (float) $stockItem->getQty();
+                    $stockItem->setQty($currentQty - $itemQty);
+                    $stockItem->setIsInStock((($currentQty - $itemQty) > 0) ? 1 : 0);
+                    $this->stockRegistry->updateStockItemBySku($itemSku, $stockItem);
+                }
             }
+
             $order->setInventoryProcessed(true)->save();
             return $this;
         }

etc/di.xml

@@ -30,4 +30,17 @@
 			</argument>
 		</arguments>
 	</type>
+    <type name="Paynl\Payment\Observer\SubtractInventoryObserver">
+        <arguments>
+            <argument name="getAssignedStockIdForWebsite" xsi:type="object">
+                Magento\InventorySales\Model\ResourceModel\GetAssignedStockIdForWebsite\Proxy
+            </argument>
+            <argument name="reservationBuilder" xsi:type="object">
+                Magento\InventoryReservationsApi\Model\ReservationBuilderInterface\Proxy
+            </argument>
+            <argument name="appendReservations" xsi:type="object">
+                Magento\InventoryReservationsApi\Model\AppendReservationsInterface\Proxy
+            </argument>            
+        </arguments>
+    </type>
 </config>