From b84d9d894f67daa6f9839723873a5339ba371dc9 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 16 Mar 2018 19:56:56 +0000 Subject: [PATCH] Fix Summary Takings including not completed transactions (#1886) --- application/controllers/Sales.php | 2 +- application/models/Sale.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 5b6cc520a..382ff7c2d 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -998,7 +998,7 @@ class Sales extends Secure_Controller $data['taxes'] = $this->sale_lib->get_taxes(); $data['discount'] = $this->sale_lib->get_discount(); $data['payments'] = $this->sale_lib->get_payments(); - // sale_type (0=pos, 1=invoice, 2=work order, 3=quote, 4=return + // sale_type (0=pos, 1=invoice, 2=work order, 3=quote, 4=return) $sale_type = $this->sale_lib->get_sale_type(); // Returns 'subtotal', 'total', 'cash_total', 'payment_total', 'amount_due', 'cash_amount_due', 'payments_cover_total' diff --git a/application/models/Sale.php b/application/models/Sale.php index 443fa9ec0..e2d4c56c1 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -285,7 +285,7 @@ class Sale extends CI_Model public function get_payments_summary($search, $filters) { // get payment summary - $this->db->select('payment_type, count(*) AS count, SUM(payment_amount) AS payment_amount'); + $this->db->select('payment_type, count(payment_amount) AS count, SUM(payment_amount) AS payment_amount'); $this->db->from('sales AS sales'); $this->db->join('sales_payments', 'sales_payments.sale_id = sales.sale_id'); $this->db->join('people AS customer_p', 'sales.customer_id = customer_p.person_id', 'LEFT'); @@ -334,6 +334,10 @@ class Sale extends CI_Model { $this->db->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount < 0'); } + elseif($filters['sale_type'] == 'all') + { + $this->db->where('sales.sale_status = ' . COMPLETED); + } if($filters['only_invoices'] != FALSE) {