From ca23da77a911c1c5ea5b640198f205e1df203530 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 20 Sep 2019 18:49:59 +0530
Subject: [PATCH] Issue #1489 fixed

---
 .../src/Repositories/OrderItemRepository.php  |  6 +-
 .../src/Repositories/RefundItemRepository.php | 56 ++++++++++++-------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php b/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
index bf39afaa2..f259d9cc6 100755
--- a/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
@@ -150,11 +150,9 @@ class OrderItemRepository extends Repository
         if (! $orderedInventory)
             return ;
 
-        if (($qty = $orderedInventory->qty - $quantity) < 0)
+        if (($qty = $orderedInventory->qty - $orderItem->qty_to_cancel) < 0)
             $qty = 0;
 
-        $orderedInventory->update([
-                'qty' => $qty
-            ]);
+        $orderedInventory->update(['qty' => $qty]);
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php b/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
index 674f29d5b..4be9f54ab 100644
--- a/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
@@ -20,7 +20,6 @@ class RefundItemRepository extends Repository
      *
      * @return Mixed
      */
-
     function model()
     {
         return RefundItem::class;
@@ -29,37 +28,54 @@ class RefundItemRepository extends Repository
     /**
      * Returns qty to product inventory after order refund
      *
-     * @param RefundItem $refundItem
-     * @param integer $quantity
+     * @param OrdreItem $orderItem
+     * @param integer    $quantity
      * @return void
      */
-    public function returnQtyToProductInventory($refundItem, $quantity)
+    public function returnQtyToProductInventory($orderItem, $quantity)
     {
-        return;
-        if (! $product = $refundItem->product)
+        if (! $product = $orderItem->product)
             return;
 
-        if ($qtyShipped = $refundItem->order_item->qty_shipped) {
+        if ($orderItem->qty_shipped && $quantity > $orderItem->qty_ordered - $orderItem->qty_shipped) {
+            $nonShippedQty = $orderItem->qty_ordered - $orderItem->qty_shipped;
 
-        } else {
+            if  (($totalShippedQtyToRefund = $quantity - $nonShippedQty) > 0) {
+                foreach ($orderItem->shipment_items as $shipmentItem) {
+                    if (! $totalShippedQtyToRefund)
+                        break;
 
+                    if (! $shipmentItem->shipment->inventory_source_id)
+                        continue;
+
+                    $shippedQtyToRefund = $totalShippedQtyToRefund > $shipmentItem->qty ? $shipmentItem->qty : $totalShippedQtyToRefund;
+
+                    $totalShippedQtyToRefund = $totalShippedQtyToRefund > $shipmentItem->qty ? $totalShippedQtyToRefund - $shipmentItem->qty : 0;
+
+                    $inventory = $product->inventories()
+                            // ->where('vendor_id', $data['vendor_id'])
+                            ->where('inventory_source_id', $shipmentItem->shipment->inventory_source_id)
+                            ->first();
+            
+                    $inventory->update(['qty' => $inventory->qty + $shippedQtyToRefund]);
+                }
+
+                $quantity -= $totalShippedQtyToRefund;
+            }
         }
 
-        $orderedInventory = $product->ordered_inventories()
-                ->where('channel_id', $refundItem->order->channel->id)
-                ->first();
+        if ($quantity) {
+            $orderedInventory = $product->ordered_inventories()
+                    ->where('channel_id', $orderItem->order->channel->id)
+                    ->first();
 
-        if ($orderedInventory) {
+            if (! $orderedInventory)
+                return;
 
-        } else {
+            if (($qty = $orderedInventory->qty - $quantity) < 0)
+                $qty = 0;
 
+            $orderedInventory->update(['qty' => $qty]);
         }
-
-        if (($qty = $orderedInventory->qty - $quantity) < 0)
-            $qty = 0;
-
-        $orderedInventory->update([
-                'qty' => $qty
-            ]);
     }
 }
\ No newline at end of file