projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite to use db_pager.
[fa-stable.git]
/
admin
/
void_transaction.php
diff --git
a/admin/void_transaction.php
b/admin/void_transaction.php
index d349e5f23e6036bf3553678030a0360fbe0b2f2b..4b5669400032cc4cca1800f5a303eaff8699bbc1 100644
(file)
--- a/
admin/void_transaction.php
+++ b/
admin/void_transaction.php
@@
-4,13
+4,15
@@
$path_to_root="..";
$page_security = 14;
include_once($path_to_root . "/includes/session.inc");
$page_security = 14;
include_once($path_to_root . "/includes/session.inc");
-page(_("Void a Transaction"));
-
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/admin/db/voiding_db.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/admin/db/voiding_db.inc");
+$js = "";
+if ($use_date_picker)
+ $js .= get_js_date_picker();
+page(_("Void a Transaction"), false, false, "", $js);
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
@@
-33,13
+35,13
@@
function voiding_controls()
end_table(1);
if (!isset($_POST['ProcessVoiding']))
end_table(1);
if (!isset($_POST['ProcessVoiding']))
- submit_center('ProcessVoiding', _("Void Transaction"));
+ submit_center('ProcessVoiding', _("Void Transaction")
, true, '', true
);
else
{
display_note(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1);
else
{
display_note(_("Are you sure you want to void this transaction ? This action cannot be undone."), 0, 1);
- submit_center_first('ConfirmVoiding', _("Proceed"));
- submit_center_last('CancelVoiding', _("Cancel"));
+ submit_center_first('ConfirmVoiding', _("Proceed")
, '', true
);
+ submit_center_last('CancelVoiding', _("Cancel")
, '', true
);
}
end_form();
}
end_form();
@@
-52,17
+54,20
@@
function check_valid_entries()
if (!is_date($_POST['date_']))
{
display_error(_("The entered date is invalid."));
if (!is_date($_POST['date_']))
{
display_error(_("The entered date is invalid."));
+ set_focus('date_');
return false;
}
if (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
return false;
}
if (!is_date_in_fiscalyear($_POST['date_']))
{
display_error(_("The entered date is not in fiscal year."));
+ set_focus('date_');
return false;
}
if (!is_numeric($_POST['trans_no']) OR $_POST['trans_no'] <= 0)
{
display_error(_("The transaction number is expected to be numeric and greater than zero."));
return false;
}
if (!is_numeric($_POST['trans_no']) OR $_POST['trans_no'] <= 0)
{
display_error(_("The transaction number is expected to be numeric and greater than zero."));
+ set_focus('trans_no');
return false;
}
return false;
}
@@
-83,6
+88,7
@@
function handle_void_transaction()
unset($_POST['trans_no']);
unset($_POST['memo_']);
unset($_POST['date_']);
unset($_POST['trans_no']);
unset($_POST['memo_']);
unset($_POST['date_']);
+ set_focus('trans_no');
return;
}
return;
}
@@
-96,8
+102,11
@@
function handle_void_transaction()
unset($_POST['memo_']);
unset($_POST['date_']);
}
unset($_POST['memo_']);
unset($_POST['date_']);
}
- else
+ else
{
display_error(_("The entered transaction does not exist or cannot be voided."));
display_error(_("The entered transaction does not exist or cannot be voided."));
+ set_focus('trans_no');
+
+ }
}
}
}
}
@@
-114,11
+123,18
@@
if (isset($_POST['ProcessVoiding']))
{
if (!check_valid_entries())
unset($_POST['ProcessVoiding']);
{
if (!check_valid_entries())
unset($_POST['ProcessVoiding']);
+ $Ajax->activate('_page_body');
}
if (isset($_POST['ConfirmVoiding']))
{
handle_void_transaction();
}
if (isset($_POST['ConfirmVoiding']))
{
handle_void_transaction();
+ $Ajax->activate('_page_body');
+}
+
+if (isset($_POST['CancelVoiding']))
+{
+ $Ajax->activate('_page_body');
}
//----------------------------------------------------------------------------------------
}
//----------------------------------------------------------------------------------------