From a34f017dbd0ae30adbab142eb812ad4a7ce668d5 Mon Sep 17 00:00:00 2001 From: Steve Ireland Date: Wed, 19 Jun 2019 21:50:20 -0400 Subject: [PATCH] Fix a couple of issues with payment processing. --- application/controllers/Sales.php | 5 +++-- application/models/Sale.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php index 0e2aef217..309bcbb3a 100644 --- a/application/controllers/Sales.php +++ b/application/controllers/Sales.php @@ -1293,11 +1293,12 @@ class Sales extends Secure_Controller $payment_id = $this->input->post('payment_id_' . $i); $payment_amount = $this->input->post('payment_amount_' . $i); $payment_type = $this->input->post('payment_type_' . $i); + $cash_refund = 0.00; // To maintain tradition we will also delete any payments with 0 amount assuming these are mistakes // introduced at sale time. This is now done in Sale.php - $payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => 0, 'employee_id' => $employee_id); + $payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => $cash_refund, 'employee_id' => $employee_id); } $payment_id = -1; @@ -1306,7 +1307,7 @@ class Sales extends Secure_Controller if($payment_type != PAYMENT_TYPE_UNASSIGNED && $payment_amount <> 0) { - $payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => 0, 'employee_id' => $employee_id); + $payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'cash_refund' => 0.00, 'employee_id' => $employee_id); } if($this->Sale->update($sale_id, $sale_data, $payments)) diff --git a/application/models/Sale.php b/application/models/Sale.php index 1c96627ce..8a0743b43 100644 --- a/application/models/Sale.php +++ b/application/models/Sale.php @@ -91,8 +91,8 @@ class Sale extends CI_Model MAX(customer_p.comments) AS comments, ' . " IFNULL($sale_total, $sale_subtotal) AS amount_due, - MAX(payments.sale_payment_amount) AS amount_tendered, - (MAX(payments.sale_payment_amount) - IFNULL($sale_total, $sale_subtotal)) AS change_due, + IFNULL(MAX(payments.sale_payment_amount), 0) AS amount_tendered, + IFNULL(MAX(payments.sale_payment_amount) - IFNULL($sale_total, $sale_subtotal),0) AS change_due, " . ' MAX(payments.payment_type) AS payment_type ');