improve echeck validation for canada, deprecate echeck-nonus and cust_main-require...

[freeside.git] / httemplate / view / cust_main / billing.html

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index fec30f8..f1add6f 100644 (file)
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,4 +1,4 @@
-<% emt('Billing information') |h %> 
+<% mt('Billing information') |h %> 
 %# If we can't see the unencrypted card, then bill now is an exercise in
 %# frustration (without some sort of job queue magic to send it to a secure
 %# machine, anyway)
@@ -84,26 +84,41 @@
 </TR>
 % } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
 %     my( $account, $aba ) = split('@', $cust_main->paymask );
+%  my $branch = '';
+%  ($branch,$aba) = split('\.',$aba) if $conf->config('echeck-country') eq 'CA';
 
 
 % my $autodemand = $cust_main->payby eq 'CHEK' ? 'automatic' : 'on-demand';
     <% mt("Electronic check ([_1])",$autodemand) |h %>
   </TD>
 </TR>
+
+%  #false laziness w/edit/cust_main/billing.html and misc/payment.cgi
+%  my $routing_label = $conf->config('echeck-country') eq 'US'
+%                        ? 'ABA/Routing number'
+%                        : 'Routing number';
+
 <TR>
-  <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
+  <TD ALIGN="right"><% mt($routing_label) |h %></TD>
   <TD BGCOLOR="#ffffff"><% $aba %></TD>
 </TR>
+
+% if ( $conf->config('echeck-country') eq 'CA' ) {
 <TR>
+  <TD ALIGN="right"><% mt('Branch number') |h %></TD>
+  <TD BGCOLOR="#ffffff"><% $branch %></TD>
+<TR>
+% }
+
   <TD ALIGN="right"><% mt('Account number') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $account %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"<% mt('>Account type') |h %></TD>
+  <TD ALIGN="right"><% mt('Account type') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->paytype %></TD>
 </TR>
 <TR>
-  <TD ALIGN="right"<% mt('>Bank name') |h %></TD>
+  <TD ALIGN="right"><% mt('Bank name') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
 % if ( $conf->exists('show_bankstate') ) {
@@ -131,7 +146,7 @@
 % if ( $cust_main->payinfo ) { 
 
 <TR>
-  <TD ALIGN="right"<% mt('>P.O.') |h %></TD>
+  <TD ALIGN="right"<% mt('P.O.') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->payinfo %></TD>
 </TR>
 % } 
@@ -203,12 +218,14 @@
     <% ( grep { $_ eq 'FAX' } @invoicing_list ) ? $yes : $no %>
   </TD>
 </TR>
+% unless ( $conf->exists('cust-email-high-visibility')) {
 <TR>
   <TD ALIGN="right"><% mt('Email invoices') |h %></TD>
   <TD BGCOLOR="#ffffff">
     <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || $no %>
   </TD>
 </TR>
+% }
 <TR>
   <TD ALIGN="right"><% mt('Invoice terms') |h %></TD>
   <TD BGCOLOR="#ffffff">
@@ -220,7 +237,7 @@
   <TD BGCOLOR="#ffffff">
     <% length($cust_main->credit_limit) ? 
         $money_char.sprintf("%.2f", $cust_main->credit_limit) :
-        'Unlimited' %>
+        emt('Unlimited') %>
   </TD>
 </TR>
 
@@ -233,7 +250,7 @@
 
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
   <TR>
-    <TD ALIGN="right"><% mt('Print CDRs') |h %></TD>
+    <TD ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->squelch_cdr ? $no : $yes %></TD>
   </TR>
 % } 
@@ -259,6 +276,15 @@
   </TR>
 % }
 
+% if ( $cust_main->locale ) {
+% my %locale_info = FS::Locales->locale_info($cust_main->locale);
+  <TR>
+    <TD ALIGN="right"><% mt('Invoicing locale') |h %></TD>
+    <TD BGCOLOR="#ffffff"><% $locale_info{name} . " (" . $locale_info{country} .")" %></TD>
+  </TR>
+% }
+
+
 </TABLE></TD></TR></TABLE>
 <%once>