echeck: add optional bank branch format, RT13360

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 8a90204..3ac0635 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -243,7 +243,7 @@
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_year" VALUE="2037">!.
 %
 %        ( $conf->exists('cust_main-require-bank-branch') ? 
-%               qq!<TR><TD ALIGN="right">$r Branch number</TD><TD COLSPAN="3">
+%               qq!<TR><TD ALIGN="right">$r !.emt('Branch number').qq!</TD><TD COLSPAN="3">
 %                   <INPUT TYPE="text" name="CHEK_payinfo3" VALUE=$branch></TD></TR>! : '' ).
 %   
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('Bank name').qq! </TD>!.

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 3d8adf9..9f1ff8d 100644 (file)
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -84,6 +84,8 @@
 </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->exists('cust_main-require-bank-branch');
 
 
 % my $autodemand = $cust_main->payby eq 'CHEK' ? 'automatic' : 'on-demand';
@@ -94,16 +96,23 @@
   <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
   <TD BGCOLOR="#ffffff"><% $aba %></TD>
 </TR>
+
+% if ( $conf->exists('cust_main-require-bank-branch') ) {
+<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') ) {