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

Author: Mulderua

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

@@ -88,20 +88,26 @@ public function __construct(
     /**
      * @param CreditmemoInterface $creditmemo
      * @param OrderInterface $order
+     * @param array $returnToStockItems
      * @return void
      */
     public function execute(
         CreditmemoInterface $creditmemo,
-        OrderInterface $order
+        OrderInterface $order,
+        array $returnToStockItems = []
     ) {
         if ($this->stockConfiguration->isAutoReturnEnabled()) {
             return;
         }
         $itemsToUpdate = [];
         foreach ($creditmemo->getItems() as $item) {
-            if ($item->getExtensionAttributes() && $item->getExtensionAttributes()->getReturnToStock()) {
-                $productId = $item->getProductId();
-                $qty = $item->getExtensionAttributes()->getReturnToStockQty();
+            $qty = $item->getQty();
+            $productId = $item->getProductId();
+            $orderItem = $this->orderItemRepository->get($item->getOrderItemId());
+            $parentItemId = $orderItem->getParentItemId();
+            if ($this->canReturnItem($item, $parentItemId, $returnToStockItems, $qty)) {
+                $parentItem = $parentItemId ? $this->getItemByOrderId($creditmemo, $parentItemId) : false;
+                $qty = $parentItem ? $parentItem->getQty() * $qty : $qty;
                 if (isset($itemsToUpdate[$productId])) {
                     $itemsToUpdate[$productId] += $qty;
                 } else {
@@ -125,4 +131,36 @@ public function execute(
             $this->priceIndexer->reindexList($updatedItemIds);
         }
     }
+
+    /**
+     * @param \Magento\Sales\Api\Data\CreditmemoInterface $creditmemo
+     * @param int $parentItemId
+     * @return bool|CreditmemoItemInterface
+     */
+    private function getItemByOrderId(\Magento\Sales\Api\Data\CreditmemoInterface $creditmemo, $parentItemId)
+    {
+        foreach ($creditmemo->getItems() as $item) {
+            if ($item->getOrderItemId() == $parentItemId) {
+                return $item;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param \Magento\Sales\Api\Data\CreditmemoItemInterface $item
+     * @param int[] $returnToStockItems
+     * @param int $parentItemId
+     * @param int $qty
+     * @return bool
+     */
+    private function canReturnItem(
+        \Magento\Sales\Api\Data\CreditmemoItemInterface $item,
+        $parentItemId = null,
+        array $returnToStockItems = [],
+        $qty
+    ) {
+        return (in_array($item->getOrderItemId(), $returnToStockItems) || in_array($parentItemId, $returnToStockItems))
+        && $qty;
+    }
 }

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

@@ -9,7 +9,6 @@
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\RefundOrderInterface;
-use Magento\SalesInventory\Model\Order\ReturnItemProcessor;
 
 /**
  * Class ReturnToStock
@@ -31,28 +30,21 @@ class ReturnToStockOrder
      */
     private $orderRepository;
 
-    /**
-     * @var ReturnItemProcessor
-     */
-    private $returnItemProcessor;
     /**
      * ReturnToStockPlugin constructor.
      *
      * @param ReturnProcessor $returnProcessor
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param OrderRepositoryInterface $orderRepository
-     * @param ReturnItemProcessor $returnItemProcessor
      */
     public function __construct(
         ReturnProcessor $returnProcessor,
         CreditmemoRepositoryInterface $creditmemoRepository,
-        OrderRepositoryInterface $orderRepository,
-        ReturnItemProcessor $returnItemProcessor
+        OrderRepositoryInterface $orderRepository
     ) {
         $this->returnProcessor = $returnProcessor;
         $this->creditmemoRepository = $creditmemoRepository;
         $this->orderRepository = $orderRepository;
-        $this->returnItemProcessor = $returnItemProcessor;
     }
 
     /**
@@ -88,8 +80,7 @@ public function afterExecute(
         }
 
         $creditmemo = $this->creditmemoRepository->get($resultEntityId);
-        $this->returnItemProcessor->execute($creditmemo, $returnToStockItems);
-        $this->returnProcessor->execute($creditmemo, $order);
+        $this->returnProcessor->execute($creditmemo, $order, $returnToStockItems);
 
         return $resultEntityId;
     }

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

@@ -9,8 +9,4 @@
     <extension_attributes for="Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface">
         <attribute code="return_to_stock_items" type="int[]"/>
     </extension_attributes>
-    <extension_attributes for="Magento\Sales\Api\Data\CreditmemoItemInterface">
-        <attribute code="return_to_stock" type="bool"/>
-        <attribute code="return_to_stock_qty" type="int"/>
-    </extension_attributes>
 </config>