diff --git a/application/controllers/Cashups.php b/application/controllers/Cashups.php index b7f0d9e96..c8d137759 100644 --- a/application/controllers/Cashups.php +++ b/application/controllers/Cashups.php @@ -78,6 +78,7 @@ class Cashups extends Secure_Controller } // if all the amounts are null or 0 that means it's a close cashup elseif(floatval($cash_ups_info->closed_amount_cash) == 0 && + floatval($cash_ups_info->closed_amount_due) == 0 && floatval($cash_ups_info->closed_amount_card) == 0 && floatval($cash_ups_info->closed_amount_check) == 0) { @@ -111,7 +112,7 @@ class Cashups extends Secure_Controller } elseif($row['payment_type'] == $this->lang->line('sales_due')) { - $cash_ups_info->closed_amount_cash -= $this->xss_clean($row['payment_amount']); + $cash_ups_info->closed_amount_due += $this->xss_clean($row['payment_amount']); } elseif($row['payment_type'] == $this->lang->line('sales_debit') || $row['payment_type'] == $this->lang->line('sales_credit')) @@ -139,7 +140,7 @@ class Cashups extends Secure_Controller $cash_ups_info->closed_amount_cash -= $this->xss_clean($row['amount']); } - $cash_ups_info->closed_amount_total = $this->_calculate_total($cash_ups_info->open_amount_cash, $cash_ups_info->transfer_amount_cash, $cash_ups_info->closed_amount_cash, $cash_ups_info->closed_amount_card, $cash_ups_info->closed_amount_check); + $cash_ups_info->closed_amount_total = $this->_calculate_total($cash_ups_info->open_amount_cash, $cash_ups_info->transfer_amount_cash, $cash_ups_info->closed_amount_cash, $cash_ups_info->closed_amount_due, $cash_ups_info->closed_amount_card, $cash_ups_info->closed_amount_check); } $data['cash_ups_info'] = $cash_ups_info; @@ -169,6 +170,7 @@ class Cashups extends Secure_Controller 'open_amount_cash' => parse_decimals($this->input->post('open_amount_cash')), 'transfer_amount_cash' => parse_decimals($this->input->post('transfer_amount_cash')), 'closed_amount_cash' => parse_decimals($this->input->post('closed_amount_cash')), + 'closed_amount_due' => parse_decimals($this->input->post('closed_amount_due')), 'closed_amount_card' => parse_decimals($this->input->post('closed_amount_card')), 'closed_amount_check' => parse_decimals($this->input->post('closed_amount_check')), 'closed_amount_total' => parse_decimals($this->input->post('closed_amount_total')), @@ -221,10 +223,11 @@ class Cashups extends Secure_Controller $open_amount_cash = parse_decimals($this->input->post('open_amount_cash')); $transfer_amount_cash = parse_decimals($this->input->post('transfer_amount_cash')); $closed_amount_cash = parse_decimals($this->input->post('closed_amount_cash')); + $closed_amount_due = parse_decimals($this->input->post('closed_amount_due')); $closed_amount_card = parse_decimals($this->input->post('closed_amount_card')); $closed_amount_check = parse_decimals($this->input->post('closed_amount_check')); - $total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_cash, $closed_amount_card, $closed_amount_check); + $total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check); echo json_encode(array('total' => to_currency_no_money($total))); } @@ -232,9 +235,9 @@ class Cashups extends Secure_Controller /* Calculate total */ - private function _calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_cash, $closed_amount_card, $closed_amount_check) + private function _calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check) { - return ($closed_amount_cash - $open_amount_cash - $transfer_amount_cash + $closed_amount_card + $closed_amount_check); + return ($closed_amount_cash - $open_amount_cash - $transfer_amount_cash + $closed_amount_due + $closed_amount_card + $closed_amount_check); } } ?> diff --git a/application/helpers/tabular_helper.php b/application/helpers/tabular_helper.php index 0f1ee1949..1a791403a 100644 --- a/application/helpers/tabular_helper.php +++ b/application/helpers/tabular_helper.php @@ -660,6 +660,7 @@ function get_cashups_manage_table_headers() array('close_employee_id' => $CI->lang->line('cashups_close_employee')), array('closed_amount_cash' => $CI->lang->line('cashups_closed_amount_cash')), array('note' => $CI->lang->line('cashups_note')), + array('closed_amount_due' => $CI->lang->line('cashups_closed_amount_due')), array('closed_amount_card' => $CI->lang->line('cashups_closed_amount_card')), array('closed_amount_check' => $CI->lang->line('cashups_closed_amount_check')), array('closed_amount_total' => $CI->lang->line('cashups_closed_amount_total')) @@ -685,6 +686,7 @@ function get_cash_up_data_row($cash_up) 'close_employee_id' => $cash_up->close_first_name . ' ' . $cash_up->close_last_name, 'closed_amount_cash' => to_currency($cash_up->closed_amount_cash), 'note' => $cash_up->note ? '' : '', + 'closed_amount_due' => to_currency($cash_up->closed_amount_due), 'closed_amount_card' => to_currency($cash_up->closed_amount_card), 'closed_amount_check' => to_currency($cash_up->closed_amount_check), 'closed_amount_total' => to_currency($cash_up->closed_amount_total), diff --git a/application/language/en-GB/cashups_lang.php b/application/language/en-GB/cashups_lang.php index 38932c9f8..4d707fc1b 100644 --- a/application/language/en-GB/cashups_lang.php +++ b/application/language/en-GB/cashups_lang.php @@ -20,6 +20,7 @@ $lang['cashups_transfer_amount_cash'] = "In/Out Cash"; $lang['cashups_closed_amount_cash'] = "Closed Cash"; $lang['cashups_closed_amount_card'] = "Cards"; $lang['cashups_closed_amount_check'] = "Cheques"; +$lang['cashups_closed_amount_due'] = "Dues"; $lang["cashups_new"] = "New Cashup"; $lang["cashups_no_cashups_to_display"] = "There are no Cashups to display"; $lang["cashups_none_selected"] = "You have not selected any Cashups"; diff --git a/application/language/en-US/cashups_lang.php b/application/language/en-US/cashups_lang.php index 5688070f1..28c708fec 100644 --- a/application/language/en-US/cashups_lang.php +++ b/application/language/en-US/cashups_lang.php @@ -20,6 +20,7 @@ $lang['cashups_transfer_amount_cash'] = "In/Out Cash"; $lang['cashups_closed_amount_cash'] = "Closed Cash"; $lang['cashups_closed_amount_card'] = "Cards"; $lang['cashups_closed_amount_check'] = "Checks"; +$lang['cashups_closed_amount_due'] = "Dues"; $lang["cashups_new"] = "New Cashup"; $lang["cashups_no_cashups_to_display"] = "There are no Cashups to display"; $lang["cashups_none_selected"] = "You have not selected any Cashups"; diff --git a/application/migrations/20180909120000_upgrade_to_3_3_0.php b/application/migrations/20180930120000_upgrade_to_3_3_0.php similarity index 100% rename from application/migrations/20180909120000_upgrade_to_3_3_0.php rename to application/migrations/20180930120000_upgrade_to_3_3_0.php diff --git a/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql b/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql index 98a610aeb..90b96d668 100644 --- a/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql +++ b/application/migrations/sqlscripts/3.2.1_to_3.3.0.sql @@ -69,6 +69,7 @@ CREATE TABLE `ospos_cash_up` ( `transfer_amount_cash` decimal(15,2) NOT NULL, `note` int(1) NOT NULL, `closed_amount_cash` decimal(15,2) NOT NULL, + `closed_amount_due` decimal(15,2) NOT NULL, `closed_amount_card` decimal(15,2) NOT NULL, `closed_amount_check` decimal(15,2) NOT NULL, `closed_amount_total` decimal(15,2) NOT NULL, diff --git a/application/models/Cashup.php b/application/models/Cashup.php index da938bc87..de03509b9 100644 --- a/application/models/Cashup.php +++ b/application/models/Cashup.php @@ -63,6 +63,7 @@ class Cashup extends CI_Model MAX(cash_up.open_amount_cash) AS open_amount_cash, MAX(cash_up.transfer_amount_cash) AS transfer_amount_cash, MAX(cash_up.closed_amount_cash) AS closed_amount_cash, + MAX(cash_up.closed_amount_due) AS closed_amount_due, MAX(cash_up.closed_amount_card) AS closed_amount_card, MAX(cash_up.closed_amount_check) AS closed_amount_check, MAX(cash_up.closed_amount_total) AS closed_amount_total, @@ -131,6 +132,7 @@ class Cashup extends CI_Model cash_up.open_amount_cash AS open_amount_cash, cash_up.transfer_amount_cash AS transfer_amount_cash, cash_up.closed_amount_cash AS closed_amount_cash, + cash_up.closed_amount_due AS closed_amount_due, cash_up.closed_amount_card AS closed_amount_card, cash_up.closed_amount_check AS closed_amount_check, cash_up.closed_amount_total AS closed_amount_total, diff --git a/application/views/cashups/form.php b/application/views/cashups/form.php index 5696e2d3a..ede1c42e8 100644 --- a/application/views/cashups/form.php +++ b/application/views/cashups/form.php @@ -125,6 +125,26 @@ +
+ lang->line('cashups_closed_amount_due'), 'closed_amount_due', array('class'=>'control-label col-xs-3')); ?> +
+
+ + config->item('currency_symbol'); ?> + + 'closed_amount_due', + 'id'=>'closed_amount_due', + 'class'=>'form-control input-sm', + 'value'=>to_currency_no_money($cash_ups_info->closed_amount_due)) + );?> + + config->item('currency_symbol'); ?> + +
+
+
+
lang->line('cashups_closed_amount_card'), 'closed_amount_card', array('class'=>'control-label col-xs-3')); ?>
@@ -279,10 +299,11 @@ $(document).ready(function() language: '' }); - $('#open_amount_cash, #transfer_amount_cash, #closed_amount_cash, #closed_amount_card, #closed_amount_check').keyup(function() { + $('#open_amount_cash, #transfer_amount_cash, #closed_amount_cash, #closed_amount_due, #closed_amount_card, #closed_amount_check').keyup(function() { $.post("", { 'open_amount_cash': $('#open_amount_cash').val(), 'transfer_amount_cash': $('#transfer_amount_cash').val(), + 'closed_amount_due': $('#closed_amount_due').val(), 'closed_amount_cash': $('#closed_amount_cash').val(), 'closed_amount_card': $('#closed_amount_card').val(), 'closed_amount_check': $('#closed_amount_check').val()