[freeside-commits] freeside/httemplate/view/cust_main billing.html, 1.33.2.4, 1.33.2.5

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail.420.am:/tmp/cvs-serv10621/httemplate/view/cust_main

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	billing.html 
Log Message:
improve echeck validation for canada, deprecate echeck-nonus and cust_main-require-bank-branch config in favor of echeck-country, RT#15982

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/billing.html,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -u -w -d -r1.33.2.4 -r1.33.2.5
--- billing.html	21 Oct 2011 20:08:31 -0000	1.33.2.4
+++ billing.html	14 Jan 2012 07:05:18 -0000	1.33.2.5
@@ -85,7 +85,7 @@
 % } 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->exists('cust_main-require-bank-branch');
+%  ($branch,$aba) = split('\.',$aba) if $conf->config('echeck-country') eq 'CA';
 
 
 % my $autodemand = $cust_main->payby eq 'CHEK' ? 'automatic' : 'on-demand';
@@ -93,12 +93,17 @@
   </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->exists('cust_main-require-bank-branch') ) {
+% if ( $conf->config('echeck-country') eq 'CA' ) {
 <TR>
   <TD ALIGN="right"><% mt('Branch number') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $branch %></TD>