diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-12-13 00:13:37 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-12-13 00:13:37 +0000 |
| commit | 1208d15943738e80e267609aa88f16ec722aaba9 (patch) | |
| tree | e38c43c70a173dd6f2549f2468bf8198214a780c /UI | |
| parent | 8f62103e122793ebe3db93819417e688ce5b1e18 (diff) | |
More payment fixes
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1976 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'UI')
| -rw-r--r-- | UI/lib/elements.html | 2 | ||||
| -rw-r--r-- | UI/lib/ui-header.html | 4 | ||||
| -rw-r--r-- | UI/payments/check_job.html | 36 | ||||
| -rw-r--r-- | UI/payments/payments_detail.html | 2 | ||||
| -rw-r--r-- | UI/payments/payments_filter.html | 17 |
5 files changed, 59 insertions, 2 deletions
diff --git a/UI/lib/elements.html b/UI/lib/elements.html index 8b6900c2..4345e7ee 100644 --- a/UI/lib/elements.html +++ b/UI/lib/elements.html @@ -109,7 +109,7 @@ <?lsmb text_attr = 'text' ?> <?lsmb END ?> <?lsmb IF element_data.defined('value_attr') ?> - <?lsmb text_attr = element_data.value_attr ?> + <?lsmb value_attr = element_data.value_attr ?> <?lsmb element.delete('value_attr') ?> <?lsmb ELSE ?> <?lsmb value_attr = 'value' ?> diff --git a/UI/lib/ui-header.html b/UI/lib/ui-header.html index 868b44ab..a3f46629 100644 --- a/UI/lib/ui-header.html +++ b/UI/lib/ui-header.html @@ -5,6 +5,10 @@ <title><?lsmb form.titlebar ? form.titlebar : titlebar ?></title> <meta http-equiv="Pragma" content="no-cache" /> <meta http-equiv="Expires" content="-1" /> + <?lsmb IF refresh -?> + <meta http-equiv="refresh" + content="<?lsmb refresh.delay ?>;<?lsmb refresh.url ?>"> + <?lsmb END -?> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> <?lsmb IF form.stylesheet ?> <link rel="stylesheet" href="css/<?lsmb form.stylesheet ?>" type="text/css" title="LedgerSMB stylesheet" /> diff --git a/UI/payments/check_job.html b/UI/payments/check_job.html new file mode 100644 index 00000000..18f786cc --- /dev/null +++ b/UI/payments/check_job.html @@ -0,0 +1,36 @@ +<?lsmb INCLUDE 'ui-header.html' + include_stylesheet = [ + 'css/global.css' + 'UI/payments/payments.css' + stylesheet + ] + titlebar = text('Checking Job') # ' + refresh = { + url = "payment.pl?job_id=${job_id}&account_class=${account_class}" + delay = 20 + } +?> +<body> + <div class="listtop"><?lsmb text('Checking Job [_1]', job_id) ?></div> + <div class="info"> + <?lsmb IF job.completed; + text('Status: Still Running'); + ELSE; + text('Status: Complete'); + END ?></div> + <?lsmb IF job.completed ?> + <div class="info"> + <?lsmb IF job.success; + text('Completed Successfully'); + ELSE; + text('Job Failed'); + END ?></div> + <?lsmb IF ! job.success ?> + <div class="info"> + <?lsmb text('Error:') ?><br /> + <?lsmb job.error_condition ?> + </div> + <?lsmb END # if ! job.success ?> + <?lsmb END # if job.completed ?> +</body> +</html> diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html index 39a4f334..f926c041 100644 --- a/UI/payments/payments_detail.html +++ b/UI/payments/payments_detail.html @@ -265,7 +265,7 @@ value = count } ?> <?lsmb INCLUDE button element_data = { - text = text('Post'), + text = text((batch_id) ? 'Save' : 'Post'), value = 'post_payments_bulk' class = "submit" name = 'action' diff --git a/UI/payments/payments_filter.html b/UI/payments/payments_filter.html index 9f50a613..6ae341dd 100644 --- a/UI/payments/payments_filter.html +++ b/UI/payments/payments_filter.html @@ -2,6 +2,7 @@ include_stylesheet = [ 'css/global.css' 'UI/payments/payments.css' + stylesheet ] titlebar = text('Selection') ?> @@ -104,6 +105,22 @@ </select> </div> </div> +<div class="listtop"> + <!-- <?lsmb INCLUDE select element_data = { + name = "cash_accno" + default_values = [cash_accno] + options = cash_accounts + value_attr = "accno" + text_attr = "text" + label = text('Pay From:') # ' + } ?> --> + <select name="cash_accno" id="cash_account"> + <?lsmb FOREACH a = cash_accounts ?> + <option value="<?lsmb a.accno ?>"> + <?lsmb a.accno ?>--<?lsmb a.description ?> + </option> + <?lsmb END # foreach a ?> + </select> <div class = "input"> <?lsmb INCLUDE input element_data = { type = "text" |