mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-24 09:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix date, location and sale type filtering for summary payments (#1045)

Browse Source
This commit is contained in:
jekkos
2016-12-28 01:30:21 +01:00
committed by FrancescoUK
parent 046a02d83c
commit bc56ee54a3
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,24 +16,37 @@ class Summary_payments extends Summary_report
array('report_count' => $this->lang->line('reports_count')),
array('amount_tendered' => $this->lang->line('sales_amount_tendered'), 'sorter' => 'number_sorter'));
}
public function getData(array $inputs)
{
$this->db->select('sales_payments.payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount');
$this->db->from('sales_payments');
$this->db->join('sales AS sales', 'sales.sale_id = sales_payments.sale_id');
$w = 'WHERE DATE(salesx.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']) . ' ';
$this->_where($inputs);
if (!empty($inputs['sale_type']) && $inputs['sale_type'] != 'all')
{
$w .= ' and salesx.sales_type = ' . $this->db->escape($inputs['sale_type']) . ' ';
}
if (!empty($inputs['location']) && $inputs['location'] != 'all')
{
$w .= ' and salesx.location = ' . $this->db->escape($inputs['location']) . ' ';
}
$sql = 'select sales_payments.payment_type, count(*) AS count, SUM(sales_payments.payment_amount) AS payment_amount
from ' . $this->db->dbprefix('sales_payments') . ' as sales_payments
join (select sales_items.sale_id, case when sum(sales_items.quantity_purchased) > 0 then \'sales\' else \'returns\' end as sales_type, sales_items.item_location as location, max(sales.sale_time) as sale_time
from ' . $this->db->dbprefix('sales_items') . ' as sales_items
join ' . $this->db->dbprefix('sales') . ' as sales
group by sales_items.sale_id, sales_items.item_location) as salesx on sales_payments.sale_id = salesx.sale_id '
. $w
. ' group by payment_type';
$payments = $this->db->query($sql)->result_array();
$this->db->group_by("payment_type");
$payments = $this->db->get()->result_array();
// consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
$gift_card_count = 0;
$gift_card_amount = 0;
foreach($payments as $key=>$payment)
{
{
if( strstr($payment['payment_type'], $this->lang->line('sales_giftcard')) != FALSE )
{
$gift_card_count += $payment['count'];
@@ -48,7 +61,7 @@ class Summary_payments extends Summary_report
{
$payments[] = array('payment_type' => $this->lang->line('sales_giftcard'), 'count' => $gift_card_count, 'payment_amount' => $gift_card_amount);
}
return $payments;
}
}