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

Merge pull request #1688 from jitendra-webkul/jitendra 

Issue #1489 fixed
This commit is contained in:
Jitendra Singh 2019-10-23 13:39:25 +05:30 committed by GitHub
parent 1701f070b3 e5d606c33e
commit 782a050877
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
View File

@ -141,7 +141,7 @@ class InvoiceRepository extends Repository
foreach ($orderItem->children as $childOrderItem) {
$finalQty = $childOrderItem->qty_ordered
? ($childOrderItem->qty_ordered / $orderItem->qty_ordered) * $qty
: $childOrderItem->qty_ordered;
: $orderItem->qty_ordered;
$this->invoiceItemRepository->create([
'invoice_id' => $invoice->id,

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

@ -29,7 +29,7 @@ class RefundItemRepository extends Repository
* Returns qty to product inventory after order refund
*
* @param OrdreItem $orderItem
* @param integer $quantity
* @param integer $quantity
* @return void
*/
public function returnQtyToProductInventory($orderItem, $quantity)
@ -41,16 +41,27 @@ class RefundItemRepository extends Repository
$nonShippedQty = $orderItem->qty_ordered - $orderItem->qty_shipped;
if (($totalShippedQtyToRefund = $quantity - $nonShippedQty) > 0) {
foreach ($orderItem->shipment_items as $shipmentItem) {
$shipmentItems = $orderItem->parent ? $orderItem->parent->shipment_items : $orderItem->shipment_items;
foreach ($shipmentItems 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;
if ($orderItem->parent) {
$shippedQty = $orderItem->qty_ordered
? ($orderItem->qty_ordered / $orderItem->parent->qty_ordered) * $shipmentItem->qty
: $orderItem->parent->qty_ordered;
} else {
$shippedQty = $shipmentItem->qty;
}
$shippedQtyToRefund = $totalShippedQtyToRefund > $shippedQty ? $shippedQty : $totalShippedQtyToRefund;
$totalShippedQtyToRefund = $totalShippedQtyToRefund > $shippedQty ? $totalShippedQtyToRefund - $shippedQty : 0;
$inventory = $product->inventories()
// ->where('vendor_id', $data['vendor_id'])

2
packages/Webkul/Sales/src/Repositories/RefundRepository.php
View File

@ -144,7 +144,7 @@ class RefundRepository extends Repository
foreach ($orderItem->children as $childOrderItem) {
$finalQty = $childOrderItem->qty_ordered
? ($childOrderItem->qty_ordered / $orderItem->qty_ordered) * $qty
: $childOrderItem->qty_ordered;
: $orderItem->qty_ordered;
$refundItem->child = $this->refundItemRepository->create([
'refund_id' => $refund->id,