From b7fcc94eb0b79acbcb26b682823088e1e37ea2a2 Mon Sep 17 00:00:00 2001 From: SteveIreland Date: Tue, 30 Jun 2020 22:23:09 -0400 Subject: [PATCH] Fixes #2872 SQL Error in Sale.php --- application/models/Sale.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/models/Sale.php b/application/models/Sale.php index 5f34b0b47..fba5a0feb 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -76,9 +76,9 @@ class Sale extends CI_Model MAX(customer_p.email) AS email, MAX(customer_p.comments) AS comments, ' . " - MAX($sale_total) AS amount_due, - IFNULL(MAX(payments.sale_payment_amount), 0) AS amount_tendered, - IFNULL(MAX(payments.sale_payment_amount) - MAX($sale_total),0) AS change_due, + $sale_total AS amount_due, + MAX(IFNULL(payments.sale_payment_amount, 0)) AS amount_tendered, + MAX(IFNULL(payments.sale_payment_amount,0)) - $sale_total AS change_due, " . ' MAX(payments.payment_type) AS payment_type '); @@ -94,8 +94,8 @@ class Sale extends CI_Model $this->db->where('sales.sale_id', $sale_id); - $this->db->group_by('sale_id'); - $this->db->order_by('sale_time', 'asc'); + $this->db->group_by('sales.sale_id'); + $this->db->order_by('sales.sale_time', 'asc'); return $this->db->get(); }