From 511f21931cb62ce1d681645fccf2c1b7cda18ea2 Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 28 Sep 2018 20:52:42 +0200 Subject: [PATCH] Fix discount totals --- application/models/reports/Summary_discounts.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/models/reports/Summary_discounts.php b/application/models/reports/Summary_discounts.php index 41f28c5ac..2919bcb4d 100644 --- a/application/models/reports/Summary_discounts.php +++ b/application/models/reports/Summary_discounts.php @@ -7,7 +7,7 @@ class Summary_discounts extends Summary_report protected function _get_data_columns() { return array( - array('discount' => $this->lang->line('reports_discount_percent'), 'sorter' => 'number_sorter'), + array('discount' => $this->lang->line('reports_discount'), 'sorter' => 'number_sorter'), array('count' => $this->lang->line('reports_count')), array('total' => $this->lang->line('reports_total'))); } @@ -16,12 +16,12 @@ class Summary_discounts extends Summary_report { if($inputs['discount_type'] == FIXED) { - $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->select('SUM(sales_items.discount) 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('SUM(payment_amount) AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count'); + $this->db->select('SUM(payment_amount) * sales_items.discount / 100.0 AS total, MAX(CONCAT(sales_items.discount, "%")) AS discount, count(*) AS count'); $this->db->where('discount_type',PERCENT); } @@ -33,7 +33,6 @@ 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->db->where('payment_type <>', 'Cash'); $this->_where($inputs);