MAGETWO-59080: Introduce ability return to stock through api for Configurable and Bundle products

Author: Mulderua

app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php

@@ -14,11 +14,6 @@
  */
 class ReturnProcessor
 {
-    /**
-     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
-     */
-    private $stockConfiguration;
-
     /**
      * @var \Magento\CatalogInventory\Api\StockManagementInterface
      */
@@ -66,7 +61,6 @@ class ReturnProcessor
      * @param \Magento\Sales\Api\OrderItemRepositoryInterface $orderItemRepository
      */
     public function __construct(
-        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
         \Magento\CatalogInventory\Api\StockManagementInterface $stockManagement,
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexer,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer,
@@ -75,7 +69,6 @@ public function __construct(
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
         \Magento\Sales\Api\OrderItemRepositoryInterface $orderItemRepository
     ) {
-        $this->stockConfiguration = $stockConfiguration;
         $this->stockManagement = $stockManagement;
         $this->stockIndexerProcessor = $stockIndexer;
         $this->priceIndexer = $priceIndexer;
@@ -96,9 +89,6 @@ public function execute(
         OrderInterface $order,
         array $returnToStockItems = []
     ) {
-        if ($this->stockConfiguration->isAutoReturnEnabled()) {
-            return;
-        }
         $itemsToUpdate = [];
         foreach ($creditmemo->getItems() as $item) {
             $qty = $item->getQty();

app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockInvoice.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\SalesInventory\Model\Plugin\Order;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
@@ -36,23 +37,31 @@ class ReturnToStockInvoice
      */
     private $invoiceRepository;
 
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
     /**
      * ReturnToStockInvoice constructor.
      * @param ReturnProcessor $returnProcessor
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param OrderRepositoryInterface $orderRepository
      * @param InvoiceRepositoryInterface $invoiceRepository
+     * @param StockConfigurationInterface $stockConfiguration
      */
     public function __construct(
         ReturnProcessor $returnProcessor,
         CreditmemoRepositoryInterface $creditmemoRepository,
         OrderRepositoryInterface $orderRepository,
-        InvoiceRepositoryInterface $invoiceRepository
+        InvoiceRepositoryInterface $invoiceRepository,
+        StockConfigurationInterface $stockConfiguration
     ) {
         $this->returnProcessor = $returnProcessor;
         $this->creditmemoRepository = $creditmemoRepository;
         $this->orderRepository = $orderRepository;
         $this->invoiceRepository = $invoiceRepository;
+        $this->stockConfiguration = $stockConfiguration;
     }
 
     /**
@@ -79,6 +88,10 @@ public function afterExecute(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface $arguments = null
     ) {
+        if ($this->stockConfiguration->isAutoReturnEnabled()) {
+            return $resultEntityId;
+        }
+
         $invoice = $this->invoiceRepository->get($invoiceId);
         $order = $this->orderRepository->get($invoice->getOrderId());
 

app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\SalesInventory\Model\Plugin\Order;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -30,6 +31,11 @@ class ReturnToStockOrder
      */
     private $orderRepository;
 
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
     /**
      * ReturnToStockPlugin constructor.
      *
@@ -40,11 +46,13 @@ class ReturnToStockOrder
     public function __construct(
         ReturnProcessor $returnProcessor,
         CreditmemoRepositoryInterface $creditmemoRepository,
-        OrderRepositoryInterface $orderRepository
+        OrderRepositoryInterface $orderRepository,
+        StockConfigurationInterface $stockConfiguration
     ) {
         $this->returnProcessor = $returnProcessor;
         $this->creditmemoRepository = $creditmemoRepository;
         $this->orderRepository = $orderRepository;
+        $this->stockConfiguration = $stockConfiguration;
     }
 
     /**
@@ -69,6 +77,10 @@ public function afterExecute(
         \Magento\Sales\Api\Data\CreditmemoCommentCreationInterface $comment = null,
         \Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface $arguments = null
     ) {
+        if ($this->stockConfiguration->isAutoReturnEnabled()) {
+            return $resultEntityId;
+        }
+
         $order = $this->orderRepository->get($orderId);
 
         $returnToStockItems = [];