diff options
Diffstat (limited to 'httemplate/view/cust_main/billing.html')
| -rw-r--r-- | httemplate/view/cust_main/billing.html | 93 |
1 files changed, 24 insertions, 69 deletions
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 5786a0711..18a203bd6 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -6,7 +6,22 @@ Billing information (<A HREF="<%= $p %>misc/bill.cgi?<%= $cust_main->custnum %>">Bill now</A>) <%= ntable("#cccccc") %><TR><TD><%= ntable("#cccccc",2) %> - +<TR> + <TD ALIGN="right">Tax exempt</TD> + <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD> +</TR> +<TR> + <TD ALIGN="right">Postal invoices</TD> + <TD BGCOLOR="#ffffff"> + <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %> + </TD> +</TR> +<TR> + <TD ALIGN="right">Email invoices</TD> + <TD BGCOLOR="#ffffff"> + <%= join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no' %> + </TD> +</TR> <TR> <TD ALIGN="right">Billing type</TD> <TD BGCOLOR="#ffffff"> @@ -20,37 +35,10 @@ Billing information <TD ALIGN="right">Card number</TD> <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo_masked %></TD> </TR> - -<% -#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html -my( $mon, $year ); -my $date = $cust_main->paydate || '12-2037'; -if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format - ( $mon, $year ) = ( $2, $1 ); -} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) { - ( $mon, $year ) = ( $1, $3 ); -} else { - warn "unrecognized expiration date format: $date"; - ( $mon, $year ) = ( '', '' ); -} -%> <TR> <TD ALIGN="right">Expiration</TD> - <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD> -</TR> - -<% if ( $cust_main->paystart_month ) { %> - <TR> - <TD ALIGN="right">Start date</TD> - <TD BGCOLOR="#ffffff"><%= $cust_main->paystart_month. '/'. $cust_main->paystart_year %> - </TR> -<% } elsif ( $cust_main->payissue ) { %> - <TR> - <TD ALIGN="right">Issue #</TD> - <TD BGCOLOR="#ffffff"><%= $cust_main->payissue %> - </TR> -<% } %> - + <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD> +</TR> <TR> <TD ALIGN="right">Name on card</TD> <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD> @@ -69,7 +57,7 @@ if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format </TR> <TR> <TD ALIGN="right">Account number</TD> - <TD BGCOLOR="#ffffff"><%= 'x'x(length($account)-2). substr($account,(length($account)-2)) %></TD> + <TD BGCOLOR="#ffffff"><%= $account %></TD> </TR> <TR> <TD ALIGN="right">Bank name</TD> @@ -103,6 +91,10 @@ if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format <% } %> <TR> + <TD ALIGN="right">Expiration</TD> + <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD> +</TR> +<TR> <TD ALIGN="right">Attention</TD> <TD BGCOLOR="#ffffff"><%= $cust_main->payname %></TD> </TR> @@ -116,49 +108,12 @@ if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format <TD ALIGN="right">Authorized by</TD> <TD BGCOLOR="#ffffff"><%= $cust_main->payinfo %></TD> </TR> - -<% -#false laziness w/above etc. -my( $mon, $year ); -my $date = $cust_main->paydate || '12-2037'; -if ( $date =~ /^(\d{4})-(\d{1,2})-\d{1,2}$/ ) { #PostgreSQL date format - ( $mon, $year ) = ( $2, $1 ); -} elsif ( $date =~ /^(\d{1,2})-(\d{1,2}-)?(\d{4}$)/ ) { - ( $mon, $year ) = ( $1, $3 ); -} else { - warn "unrecognized expiration date format: $date"; - ( $mon, $year ) = ( '', '' ); -} -%> <TR> <TD ALIGN="right">Expiration</TD> - <TD BGCOLOR="#ffffff"><%= "$mon/$year" %></TD> + <TD BGCOLOR="#ffffff"><%= $cust_main->paydate %></TD> </TR> <% } %> -<TR> - <TD ALIGN="right">Tax exempt</TD> - <TD BGCOLOR="#ffffff"><%= $cust_main->tax ? 'yes' : 'no' %></TD> -</TR> -<TR> - <TD ALIGN="right">Postal invoices</TD> - <TD BGCOLOR="#ffffff"> - <%= ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no' %> - </TD> -</TR> -<TR> - <TD ALIGN="right">FAX invoices</TD> - <TD BGCOLOR="#ffffff"> - <%= ( grep { $_ eq 'FAX' } @invoicing_list ) ? 'yes' : 'no' %> - </TD> -</TR> -<TR> - <TD ALIGN="right">Email invoices</TD> - <TD BGCOLOR="#ffffff"> - <%= join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %> - </TD> -</TR> - </TABLE></TD></TR></TABLE> |