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

Author: Mulderua

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

@@ -95,7 +95,7 @@ public function execute(
             $productId = $item->getProductId();
             $orderItem = $this->orderItemRepository->get($item->getOrderItemId());
             $parentItemId = $orderItem->getParentItemId();
-            if ($this->canReturnItem($item, $parentItemId, $returnToStockItems, $qty)) {
+            if ($this->canReturnItem($item, $qty, $parentItemId, $returnToStockItems)) {
                 $parentItem = $parentItemId ? $this->getItemByOrderId($creditmemo, $parentItemId) : false;
                 $qty = $parentItem ? $parentItem->getQty() * $qty : $qty;
                 if (isset($itemsToUpdate[$productId])) {
@@ -139,16 +139,16 @@ private function getItemByOrderId(\Magento\Sales\Api\Data\CreditmemoInterface $c
 
     /**
      * @param \Magento\Sales\Api\Data\CreditmemoItemInterface $item
+     * @param int $qty
      * @param int[] $returnToStockItems
      * @param int $parentItemId
-     * @param int $qty
      * @return bool
      */
     private function canReturnItem(
         \Magento\Sales\Api\Data\CreditmemoItemInterface $item,
+        $qty,
         $parentItemId = null,
-        array $returnToStockItems = [],
-        $qty
+        array $returnToStockItems = []
     ) {
         return (in_array($item->getOrderItemId(), $returnToStockItems) || in_array($parentItemId, $returnToStockItems))
         && $qty;

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

@@ -5,57 +5,50 @@
  */
 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;
-use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Api\RefundInvoiceInterface;
-
 /**
  * Class ReturnToStockInvoice
  */
 class ReturnToStockInvoice
 {
     /**
-     * @var ReturnProcessor
+     * @var \Magento\SalesInventory\Model\Order\ReturnProcessor
      */
     private $returnProcessor;
 
     /**
-     * @var CreditmemoRepositoryInterface
+     * @var \Magento\Sales\Api\CreditmemoRepositoryInterface
      */
     private $creditmemoRepository;
 
     /**
-     * @var OrderRepositoryInterface
+     * @var \Magento\Sales\Api\OrderRepositoryInterface
      */
     private $orderRepository;
 
     /**
-     * @var InvoiceRepositoryInterface
+     * @var \Magento\Sales\Api\InvoiceRepositoryInterface
      */
     private $invoiceRepository;
 
     /**
-     * @var StockConfigurationInterface
+     * @var \Magento\CatalogInventory\Api\StockConfigurationInterface
      */
     private $stockConfiguration;
 
     /**
      * ReturnToStockInvoice constructor.
-     * @param ReturnProcessor $returnProcessor
-     * @param CreditmemoRepositoryInterface $creditmemoRepository
-     * @param OrderRepositoryInterface $orderRepository
-     * @param InvoiceRepositoryInterface $invoiceRepository
-     * @param StockConfigurationInterface $stockConfiguration
+     * @param \Magento\SalesInventory\Model\Order\ReturnProcessor $returnProcessor
+     * @param \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      */
     public function __construct(
-        ReturnProcessor $returnProcessor,
-        CreditmemoRepositoryInterface $creditmemoRepository,
-        OrderRepositoryInterface $orderRepository,
-        InvoiceRepositoryInterface $invoiceRepository,
-        StockConfigurationInterface $stockConfiguration
+        \Magento\SalesInventory\Model\Order\ReturnProcessor $returnProcessor,
+        \Magento\Sales\Api\CreditmemoRepositoryInterface $creditmemoRepository,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Sales\Api\InvoiceRepositoryInterface $invoiceRepository,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
     ) {
         $this->returnProcessor = $returnProcessor;
         $this->creditmemoRepository = $creditmemoRepository;
@@ -65,7 +58,7 @@ public function __construct(
     }
 
     /**
-     * @param RefundInvoiceInterface $refundService
+     * @param \Magento\Sales\Api\RefundInvoiceInterface $refundService
      * @param int $resultEntityId
      * @param int $invoiceId
      * @param \Magento\Sales\Api\Data\CreditmemoItemCreationInterface[] $items
@@ -78,7 +71,7 @@ public function __construct(
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterExecute(
-        RefundInvoiceInterface $refundService,
+        \Magento\Sales\Api\RefundInvoiceInterface $refundService,
         $resultEntityId,
         $invoiceId,
         array $items = [],

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

@@ -42,6 +42,7 @@ class ReturnToStockOrder
      * @param ReturnProcessor $returnProcessor
      * @param CreditmemoRepositoryInterface $creditmemoRepository
      * @param OrderRepositoryInterface $orderRepository
+     * @param StockConfigurationInterface $stockConfiguration
      */
     public function __construct(
         ReturnProcessor $returnProcessor,

app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php

@@ -137,7 +137,6 @@ public function testAfterExecute()
             ->method('execute')
             ->with($this->creditmemoMock, $this->orderMock, $returnToStockItems);
 
-
         $this->stockConfigurationMock->expects($this->once())
             ->method('isAutoReturnEnabled')
             ->willReturn(false);