mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-07-28 15:47:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2395 from opensourcepos/summary-payments-2

Browse Source 
Two more Payment Summary report fixes.
This commit is contained in:
Steve Ireland
2019-03-09 16:59:13 -05:00
committed by GitHub
parent fb112e502b d242c65e99
commit 805dfbe4d3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/models/reports/Summary_payments.php
View File

@@ -78,7 +78,7 @@ class Summary_payments extends Summary_report
$select = '\'' . $this->lang->line('reports_trans_payments') . '\' AS trans_group, ';
$select .= 'sales_payments.payment_type as trans_type, ';
$select .= 'COUNT(sales.sale_id) AS trans_count, ';
$select .= 'SUM(payment_amount) * -1 AS trans_amount,';
$select .= 'SUM(payment_amount) AS trans_amount,';
$select .= 'SUM(payment_amount) AS trans_payments,';
$select .= '0 AS trans_refunded, ';
$select .= '0 AS trans_due ';
@@ -99,7 +99,7 @@ class Summary_payments extends Summary_report
if($payment_summary['trans_type'] == $cash_payment)
{
$payments[$key]['trans_refunded'] = $total_cash_refund;
$payments[$key]['trans_payments'] -= $total_cash_refund;
$payments[$key]['trans_amount'] -= $total_cash_refund;
}
}
@@ -120,7 +120,8 @@ class Summary_payments extends Summary_report
if($gift_card_count > 0)
{
$payments[] = array('trans_type' => $this->lang->line('sales_giftcard'), 'trans_count' => $gift_card_count, 'trans_amount' => $gift_card_amount);
$payments[] = array('trans_group' => $this->lang->line('reports_trans_payments'), 'trans_type' => $this->lang->line('sales_giftcard'), 'trans_count' => $gift_card_count,
'trans_amount' => $gift_card_amount, 'trans_payments' => $gift_card_amount, 'trans_refunded' => 0, 'trans_due' => 0);
}
return array_merge($sales, $separator, $payments);