mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-25 00:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add totals to discount report

Browse Source
This commit is contained in:
jekkos
2018-09-24 22:59:43 +02:00
committed by jekkos
parent 6d5f518855
commit 68051bdcdb
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Reports.php
View File

@@ -348,6 +348,7 @@ class Reports extends Secure_Controller
foreach($report_data as $row)
{
$tabular_data[] = $this->xss_clean(array(
'total' => to_currency($row['total']),
'discount' => $row['discount'],
'count' => $row['count']
));

8
application/models/reports/Summary_discounts.php
View File

@@ -8,19 +8,20 @@ class Summary_discounts extends Summary_report
{
return array(
array('discount' => $this->lang->line('reports_discount_percent'), 'sorter' => 'number_sorter'),
array('count' => $this->lang->line('reports_count')));
array('count' => $this->lang->line('reports_count')),
array('total' => $this->lang->line('reports_total')));
}
public function getData(array $inputs)
{
if($inputs['discount_type'] == FIXED)
{
$this->db->select('MAX(CONCAT("'.$this->config->item('currency_symbol').'",sales_items.discount)) AS discount, count(*) AS count');
$this->db->select('SUM(payment_amount) AS total, MAX(CONCAT("'.$this->config->item('currency_symbol').'",sales_items.discount)) AS discount, count(*) AS count');
$this->db->where('discount_type',FIXED);
}
elseif($inputs['discount_type'] == PERCENT)
{
$this->db->select('MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
$this->db->select('SUM(payment_amount) AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count');
$this->db->where('discount_type',PERCENT);
}
@@ -30,6 +31,7 @@ class Summary_discounts extends Summary_report
$this->db->from('sales_items AS sales_items');
$this->db->join('sales_payments', 'sales_payments.sale_id = sales_items.sale_id');
$this->db->join('sales AS sales', 'sales_items.sale_id = sales.sale_id', 'inner');
$this->_where($inputs);