mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-24 16:28:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Track initial cash refunds

Browse Source
This commit is contained in:
Steve Ireland
2019-05-12 21:42:01 -04:00
parent d47099fa23
commit 595ef0b617
7 changed files with 150 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/controllers/Sales.php
View File

@@ -582,6 +582,21 @@ class Sales extends Secure_Controller
}
$data['amount_change'] = $data['amount_due'] * -1;
if($data['amount_change'] > 0)
{
// Save cash refund to the cash payment transaction if found, if not then add as new Cash transaction
if(array_key_exists($this->lang->line('sales_cash'), $data['payments']))
{
$data['payments'][$this->lang->line('sales_cash')]['cash_refund'] = $data['amount_change'];
}
else
{
$payment = array($this->lang->line('sales_cash') => array('payment_type' => $this->lang->line('sales_cash'), 'payment_amount' => 0, 'cash_refund' => $data['amount_change']));
$data['payments'] += $payment;
}
}
$data['print_price_info'] = TRUE;
$override_invoice_number = NULL;
@@ -1281,7 +1296,7 @@ class Sales extends Secure_Controller
// 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, 'payment_user' => $employee_id);
$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'employee_id' => $employee_id);
}
$payment_id = -1;
@@ -1290,7 +1305,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, 'payment_user' => $employee_id);
$payments[] = array('payment_id' => $payment_id, 'payment_type' => $payment_type, 'payment_amount' => $payment_amount, 'employee_id' => $employee_id);
}
if($this->Sale->update($sale_id, $sale_data, $payments))