diff options
| author | ivan <ivan> | 2004-08-19 00:22:29 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2004-08-19 00:22:29 +0000 |
| commit | 19ca51b6b215fc76757812b5b4d2bea6dd6e4cf7 (patch) | |
| tree | 2b974fc53ffb4f2122f74bef715ba0e633d9cba6 /httemplate | |
| parent | a5b491b6948fdac9750843e2bacf65284fdae5ba (diff) | |
add customer # to payment reports, add table cell alignment option to general search component
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/search/cust_pay.cgi | 6 | ||||
| -rw-r--r-- | httemplate/search/elements/search.html | 27 |
2 files changed, 25 insertions, 8 deletions
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi index ba2bc63f0..3f5b72ab5 100755 --- a/httemplate/search/cust_pay.cgi +++ b/httemplate/search/cust_pay.cgi @@ -99,7 +99,8 @@ 'count_query' => $count_query, 'count_addl' => [ '$%.2f total paid', ], 'header' => - [ qw(Payment Amount Date), 'Contact name', 'Company', ], + [ qw(Payment Amount Date), 'Cust #', 'Contact name', + 'Company', ], 'fields' => [ sub { my $cust_pay = shift; @@ -115,6 +116,7 @@ }, sub { sprintf('$%.2f', shift->paid ) }, sub { time2str('%b %d %Y', shift->_date ) }, + 'custnum', sub { my $cust_main = shift->cust_main; $cust_main->get('last'). ', '. $cust_main->first; }, @@ -122,12 +124,14 @@ $cust_main->company; }, ], + 'align' => 'lrrrll', 'links' => [ '', '', '', $link, $link, + $link, ], ) %> diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html index 12ab83ba5..566ea8391 100644 --- a/httemplate/search/elements/search.html +++ b/httemplate/search/elements/search.html @@ -2,6 +2,16 @@ my(%opt) = @_; + my %align = ( + 'l' => 'left', + 'r' => 'right', + 'c' => 'center', + ' ' => '', + '.' => '', + ); + $opt{align} = [ map $align{$_}, split(//, $opt{align}) ], + unless !$opt{align} || ref($opt{align}); + if ( ref($opt{'query'}) ) { } @@ -85,11 +95,14 @@ </TR> <% foreach my $row ( @$rows ) { %> <TR> - <% if ( $opt{'fields'} ) { %> - <% my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; %> - <% foreach my $field ( @{$opt{'fields'}} ) { %> - <% my $a = ''; %> - <% if ( $links ) { + <% if ( $opt{'fields'} ) { + my $links = $opt{'links'} ? [ @{$opt{'links'}} ] : ''; + my $aligns = $opt{'align'} ? [ @{$opt{'align'}} ] : ''; + foreach my $field ( @{$opt{'fields'}} ) { + my $align = $aligns ? shift @$aligns : ''; + $align = " ALIGN=$align" if $align; + my $a = ''; + if ( $links ) { my $link = shift @$links; $link = &{$link}($row) if ref($link) eq 'CODE'; if ( $link ) { @@ -104,9 +117,9 @@ } %> <% if ( ref($field) eq 'CODE' ) { %> - <TD><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD> + <TD<%= $align %>><%= $a %><%= &{$field}($row) %><%= $a ? '</A>' : '' %></TD> <% } else { %> - <TD><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD> + <TD<%= $align %>><%= $a %><%= $row->$field() %><%= $a ? '</A>' : '' %></TD> <% } %> <% } %> <% } else { %> |