Skip to content

Commit

Permalink
0004664: gl_bank.php use of ['pay_items'] corrupted by multiple tabs …
Browse files Browse the repository at this point in the history 
…entering/modifying payments
  • Loading branch information
Braath Waate committed Aug 29, 2018
1 parent ac7cf16 commit ddbdee6
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 28 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Expand Up @@ -682,3 +682,5 @@ a supplier offer a series of barcodes for essentially the same item,
at least from the buyers perspective.
While these can be entered as additional foreign codes,
alternatively an RE can be devised to handle them as a single foreign code.

## BUGFIX: 0004664: gl_bank.php use of $_SESSION['pay_items'] corrupted by multiple tabs entering/modifying payments
68 changes: 40 additions & 28 deletions core/gl/gl_bank.php
View file
Expand Up @@ -12,8 +12,20 @@
$path_to_root = "..";
include_once($path_to_root . "/includes/ui/items_cart.inc");
include_once($path_to_root . "/includes/session.inc");

if (isset($_POST['pay_items'])) {
display_notification("hello");
$_POST['pay_items'] = unserialize(html_entity_decode($_POST['pay_items']));
$order=$_POST['pay_items'];
foreach ($order->gl_items as $line => $item)
{
display_notification($item->code_id);
}
}


$page_security = isset($_GET['NewPayment']) ||
@($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT)
@($_POST['pay_items']->trans_type==ST_BANKPAYMENT)
? 'SA_PAYMENT' : 'SA_DEPOSIT';

include_once($path_to_root . "/includes/date_functions.inc");
Expand Down Expand Up @@ -52,7 +64,7 @@
check_db_has_bank_accounts(_("There are no bank accounts defined in the system."));

if (isset($_GET['ModifyDeposit']) || isset($_GET['ModifyPayment']))
check_is_editable($_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id);
check_is_editable($_POST['pay_items']->trans_type, $_POST['pay_items']->order_id);

//----------------------------------------------------------------------------------------
if (list_updated('PersonDetailID')) {
Expand Down Expand Up @@ -145,9 +157,9 @@ function create_cart($type, $trans_no)
{
global $Refs;

if (isset($_SESSION['pay_items']))
if (isset($_POST['pay_items']))
{
unset ($_SESSION['pay_items']);
unset ($_POST['pay_items']);
}

$cart = new items_cart($type);
Expand Down Expand Up @@ -214,7 +226,7 @@ function create_cart($type, $trans_no)
$_POST['ref'] = $cart->reference;
$_POST['date_'] = $cart->tran_date;

$_SESSION['pay_items'] = &$cart;
$_POST['pay_items'] = &$cart;
}
//-----------------------------------------------------------------------------------------------

Expand All @@ -224,19 +236,19 @@ function check_trans()

$input_error = 0;

if ($_SESSION['pay_items']->count_gl_items() < 1) {
if ($_POST['pay_items']->count_gl_items() < 1) {
display_error(_("You must enter at least one payment line."));
set_focus('code_id');
$input_error = 1;
}

$limit = get_bank_account_limit($_POST['bank_account'], $_POST['date_']);

$amnt_chg = -$_SESSION['pay_items']->gl_items_total()-$_SESSION['pay_items']->original_amount;
$amnt_chg = -$_POST['pay_items']->gl_items_total()-$_POST['pay_items']->original_amount;

if ($limit !== null && floatcmp($limit, -$amnt_chg) < 0)
{
display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_SESSION['pay_items']->original_amount)));
display_error(sprintf(_("The total bank amount exceeds allowed limit (%s)."), price_format($limit-$_POST['pay_items']->original_amount)));
set_focus('code_id');
$input_error = 1;
}
Expand All @@ -247,7 +259,7 @@ function check_trans()
set_focus('amount');
$input_error = 1;
}
if (!check_reference($_POST['ref'], $_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id))
if (!check_reference($_POST['ref'], $_POST['pay_items']->trans_type, $_POST['pay_items']->order_id))
{
set_focus('ref');
$input_error = 1;
Expand Down Expand Up @@ -290,14 +302,14 @@ function check_trans()
{
begin_transaction();

$_SESSION['pay_items'] = &$_SESSION['pay_items'];
$new = $_SESSION['pay_items']->order_id == 0;
$_POST['pay_items'] = &$_POST['pay_items'];
$new = $_POST['pay_items']->order_id == 0;

add_new_exchange_rate(get_bank_account_currency(get_post('bank_account')), get_post('date_'), input_num('_ex_rate'));

$trans = write_bank_transaction(
$_SESSION['pay_items']->trans_type, $_SESSION['pay_items']->order_id, $_POST['bank_account'],
$_SESSION['pay_items'], $_POST['date_'],
$_POST['pay_items']->trans_type, $_POST['pay_items']->order_id, $_POST['bank_account'],
$_POST['pay_items'], $_POST['date_'],
$_POST['PayType'], $_POST['person_id'], get_post('PersonDetailID'),
$_POST['ref'], $_POST['memo_'], true, input_num('settled_amount', null));

Expand All @@ -315,8 +327,8 @@ function check_trans()

new_doc_date($_POST['date_']);

$_SESSION['pay_items']->clear_items();
unset($_SESSION['pay_items']);
$_POST['pay_items']->clear_items();
unset($_POST['pay_items']);

commit_transaction();

Expand Down Expand Up @@ -355,10 +367,10 @@ function check_item_data()

function handle_update_item()
{
$amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');
$amount = ($_POST['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');
if($_POST['UpdateItem'] != "" && check_item_data())
{
$_SESSION['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'],
$_POST['pay_items']->update_gl_item($_POST['Index'], $_POST['code_id'],
$_POST['dimension_id'], $_POST['dimension2_id'], $amount , $_POST['LineMemo']);
}
line_start_focus();
Expand All @@ -368,7 +380,7 @@ function handle_update_item()

function handle_delete_item($id)
{
$_SESSION['pay_items']->remove_gl_item($id);
$_POST['pay_items']->remove_gl_item($id);
line_start_focus();
}

Expand All @@ -378,9 +390,9 @@ function handle_new_item()
{
if (!check_item_data())
return;
$amount = ($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');
$amount = ($_POST['pay_items']->trans_type==ST_BANKPAYMENT ? 1:-1) * input_num('amount');

$_SESSION['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
$_POST['pay_items']->add_gl_item($_POST['code_id'], $_POST['dimension_id'],
$_POST['dimension2_id'], $amount, $_POST['LineMemo']);
line_start_focus();
}
Expand All @@ -401,23 +413,23 @@ function handle_new_item()

if (isset($_POST['go']))
{
display_quick_entries($_SESSION['pay_items'], $_POST['person_id'], input_num('totamount'),
$_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ? QE_PAYMENT : QE_DEPOSIT);
display_quick_entries($_POST['pay_items'], $_POST['person_id'], input_num('totamount'),
$_POST['pay_items']->trans_type==ST_BANKPAYMENT ? QE_PAYMENT : QE_DEPOSIT);
$_POST['totamount'] = price_format(0); $Ajax->activate('totamount');
line_start_focus();
}
//-----------------------------------------------------------------------------------------------

start_form();

display_bank_header($_SESSION['pay_items']);
display_bank_header($_POST['pay_items']);

start_table(TABLESTYLE2, "width='90%'", 10);
start_row();
echo "<td>";
display_gl_items($_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
_("Payment Items"):_("Deposit Items"), $_SESSION['pay_items']);
gl_options_controls($_SESSION['pay_items']);
display_gl_items($_POST['pay_items']->trans_type==ST_BANKPAYMENT ?
_("Payment Items"):_("Deposit Items"), $_POST['pay_items']);
gl_options_controls($_POST['pay_items']);
echo "</td>";
end_row();
end_table(1);
Expand All @@ -433,8 +445,8 @@ function handle_new_item()
$Ajax->activate("submit");

if (find_submit('Edit') == -1
&& $_SESSION['pay_items']->count_gl_items() >= 1)
submit_center('Process', $_SESSION['pay_items']->trans_type==ST_BANKPAYMENT ?
&& $_POST['pay_items']->count_gl_items() >= 1)
submit_center('Process', $_POST['pay_items']->trans_type==ST_BANKPAYMENT ?
_("Process Payment"):_("Process Deposit"), true, '', 'default');

div_end();
Expand Down
1 change: 1 addition & 0 deletions core/gl/includes/ui/gl_bank_ui.inc
View file
Expand Up @@ -216,6 +216,7 @@ function display_gl_items($title, &$order)
if ($order->count_gl_items())
label_row(_("Total"), number_format2(abs($order->gl_items_total()), user_price_dec()),"colspan=" . $colspan . " align=right", "align=right",3);

hidden('pay_items', htmlentities(serialize($order)));
end_table();
div_end();
}
Expand Down

0 comments on commit ddbdee6

Please sign in to comment.