From af2fd783481ceb510ac4f386381b9b0ed4860fa7 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 12 Jan 2020 20:28:29 +0000 Subject: [PATCH] Fix Graphical Summary Payment report --- application/controllers/Reports.php | 7 +++++-- application/models/reports/Summary_payments.php | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 5f4c8dd62..ce85d1088 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -866,8 +866,11 @@ class Reports extends Secure_Controller { $row = $this->xss_clean($row); - $labels[] = $row['payment_type']; - $series[] = array('meta' => $row['payment_type'] . ' ' . round($row['payment_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['payment_amount']); + if($row['trans_group'] == $this->lang->line('reports_trans_payments')) + { + $labels[] = $row['trans_type']; + $series[] = array('meta' => $row['trans_type'] . ' ' . round($row['trans_amount'] / $summary['total'] * 100, 2) . '%', 'value' => $row['trans_amount']); + } } $data = array( diff --git a/application/models/reports/Summary_payments.php b/application/models/reports/Summary_payments.php index cc5adc85f..a9e5d95a8 100644 --- a/application/models/reports/Summary_payments.php +++ b/application/models/reports/Summary_payments.php @@ -61,7 +61,7 @@ class Summary_payments extends Summary_report $this->db->where('sales.sale_status', COMPLETED); $this->_where($inputs); - $this->db->group_by("trans_type"); + $this->db->group_by('trans_type'); $sales = $this->db->get()->result_array(); @@ -89,7 +89,7 @@ class Summary_payments extends Summary_report $this->db->where('sales.sale_status', COMPLETED); $this->_where($inputs); - $this->db->group_by("sales_payments.payment_type"); + $this->db->group_by('sales_payments.payment_type'); $payments = $this->db->get()->result_array();