merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1498 from jitendra-webkul/refund 

Issue #1489 fixed
This commit is contained in:
Jitendra Singh 2019-09-20 18:50:54 +05:30 committed by GitHub
parent a2782b63b0 ca23da77a9
commit f581db8dd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Sales/src/Repositories/OrderItemRepository.php
View File

@ -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]);
}
}

56
packages/Webkul/Sales/src/Repositories/RefundItemRepository.php
View File

@ -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
]);
}
}