summaryrefslogtreecommitdiff
path: root/UI/payments
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-12-20 00:07:59 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2007-12-20 00:07:59 +0000
commit0f9d68697da12477342cc41825737b282a215f32 (patch)
tree4c2eea402e7e3a0800c5fc29a0ed1a65800ac14c /UI/payments
parentde4c93c23b93218ec5feaec2ebb01189f73428a2 (diff)
More contact, payment, voucher fixes/enhancements
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1984 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'UI/payments')
-rw-r--r--UI/payments/check_job.html2
-rw-r--r--UI/payments/payments_detail.html19
2 files changed, 17 insertions, 4 deletions
diff --git a/UI/payments/check_job.html b/UI/payments/check_job.html
index b59caeab..455a9934 100644
--- a/UI/payments/check_job.html
+++ b/UI/payments/check_job.html
@@ -25,10 +25,12 @@
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 bd41fcd2..1e75c603 100644
--- a/UI/payments/payments_detail.html
+++ b/UI/payments/payments_detail.html
@@ -13,6 +13,11 @@
<?lsmb payment_type = (account_class == 1) ? text('Payments') : text('Receipts')
?>
<body id="payment_2_body">
+<!-- CT: This template produces invalid XHTML due to the use of nested tables.
+ Because nested tables are widely used (perhaps improperly) for layout,
+ most browsers should have no issues with them. Furthermore, I cannot find
+ any cleaner solution to embedding tabular data within tabular data than
+ this -->
<div class="listtop"><?lsmb payment_type ?></div>
<form name="pay_dues" method="post" action="payment.pl">
<!-- Moving all hidden variables to the top. -CT -->
@@ -177,7 +182,11 @@
} ?>
<?lsmb r.account_number ?>
</td>
- <td class="entity_name"><?lsmb r.contact_name ?></td>
+ <td class="entity_name"><span class="<?lsmb
+ IF r.has_vouchers; 'name_has_vouchers' ;
+ ELSE ; 'name_has_no_vouchers' ;
+ END
+ ?>"><?lsmb r.contact_name ?></span></td>
<td class="invoice"><?lsmb r.total_due ?> <?lsmb currency ?></td>
<td class="payment">
<?lsmb INCLUDE input element_data = {
@@ -223,8 +232,10 @@
<tr>
<td class="invoice_date_list">&nbsp;<?lsmb i.2 ?></td>
<td class="invoice_list">&nbsp;<?lsmb i.1 ?></td>
- <td class="total_due_list">&nbsp;<?lsmb i.3 ?></td>
- <td class="paid_list">&nbsp;<?lsmb i.4 ?></td>
+ <td class="total_due_list">&nbsp;
+ <?lsmb INCLUDE format_money number=i.3 ?></td>
+ <td class="paid_list">&nbsp;
+ <?lsmb INCLUDE format_money number=i.4 ?></td>
<td class="net_due_list">&nbsp;
<?lsmb INCLUDE format_money number= i.6 ?>
<?lsmb currency ?></td>
@@ -249,7 +260,7 @@
<?lsmb INCLUDE input element_data = {
type = "hidden"
name = "net_$i.0"
- value = i.6
+ value = ${"payment_$r.contact_id_$i.0"}
} ?>
</td>
</tr>