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

Order collect total function issue fixed

This commit is contained in:
jitendra 2019-01-09 13:27:43 +05:30
parent 25e5191581
commit ab07518779
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,32 +244,23 @@ class OrderRepository extends Repository
*/ */
public function collectTotals($order) public function collectTotals($order)
{ {
$subTotalInvoiced = $baseSubTotalInvoiced = 0; $order->sub_total_invoiced = $order->base_sub_total_invoiced = 0;
$shippingInvoiced = $baseShippingInvoiced = 0; $order->shipping_invoiced = $order->base_shipping_invoiced = 0;
$taxInvoiced = $baseTaxInvoiced = 0; $order->tax_amount_invoiced = $order->base_tax_amount_invoiced = 0;
foreach($order->invoices as $invoice) { foreach($order->invoices as $invoice) {
$subTotalInvoiced += $invoice->sub_total; $order->sub_total_invoiced += $invoice->sub_total;
$baseSubTotalInvoiced += $invoice->base_sub_total; $order->base_sub_total_invoiced += $invoice->base_sub_total;
$shippingInvoiced += $invoice->shipping_amount; $order->shipping_invoiced += $invoice->shipping_amount;
$baseShippingInvoiced += $invoice->base_shipping_amount; $order->base_shipping_invoiced += $invoice->base_shipping_amount;
$taxInvoiced += $invoice->tax_amount; $order->tax_amount_invoiced += $invoice->tax_amount;
$baseTaxInvoiced += $invoice->base_tax_amount; $order->base_tax_amount_invoiced += $invoice->base_tax_amount;
} }
$order->sub_total_invoiced = $subTotalInvoiced; $order->grand_total_invoiced = $order->sub_total_invoiced + $order->shipping_invoiced + $order->tax_amount_invoiced;
$order->base_sub_total_invoiced = $baseSubTotalInvoiced; $order->base_grand_total_invoiced = $order->base_sub_total_invoiced + $order->base_shipping_invoiced + $order->base_tax_amount_invoiced;
$order->shipping_invoiced = $shippingInvoiced;
$order->base_shipping_invoiced = $baseShippingInvoiced;
$order->tax_amount_invoiced = $taxInvoiced;
$order->base_tax_amount_invoiced = $baseTaxInvoiced;
$order->grand_total_invoiced = $subTotalInvoiced + $shippingInvoiced + $taxInvoiced;
$order->base_grand_total_invoiced = $baseSubTotalInvoiced + $baseShippingInvoiced + $baseTaxInvoiced;
$order->save(); $order->save();