mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-04-15 20:37:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of issues with payment processing.

Browse Source
This commit is contained in:
Steve Ireland
2019-06-19 21:50:20 -04:00
parent 5355b671fe
commit a34f017dbd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/Sales.php
View File

@@ -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))

4
application/models/Sale.php
View File

@@ -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
');