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

Merge pull request #1425 from rahulshukla-webkul/development 

wrong grand total in invoice
This commit is contained in:
Jitendra Singh 2019-09-09 15:39:27 +05:30 committed by GitHub
parent 9d5032d619 8d578c3720
commit 889a286e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -249,7 +249,7 @@
<td>{{ core()->formatBasePrice($item->base_discount_amount) }}</td>
@endif
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_total + $item->base_tax_amount) }}</td>
<td>{{ core()->formatBasePrice($item->base_total + $item->base_tax_amount - $item->base_discount_amount) }}</td>
</tr>
@endforeach

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

@ -173,7 +173,7 @@ class OrderRepository extends Repository
$totalQtyCanceled += $item->qty_canceled;
}
if ($totalQtyOrdered != ($totalQtyRefunded + $totalQtyCanceled) &&
if ($totalQtyOrdered != ($totalQtyRefunded + $totalQtyCanceled) &&
$totalQtyOrdered == $totalQtyInvoiced + $totalQtyRefunded + $totalQtyCanceled &&
$totalQtyOrdered == $totalQtyShipped + $totalQtyRefunded + $totalQtyCanceled)
return true;