echeck: add optional bank branch format, RT13360

[freeside.git] / httemplate / edit / process / cust_main.cgi

diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index 24cecea..f62ecc2 100755 (executable)
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -42,8 +42,11 @@ $cgi->param('payby', $payby);
 
 if ( $payby ) {
   if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
-    $cgi->param('payinfo',
-      $cgi->param('payinfo1'). '@'. $cgi->param('payinfo2') );
+      my $payinfo = $cgi->param('payinfo1'). '@';
+      $payinfo .= $cgi->param('payinfo3').'.' 
+            if $conf->exists('cust_main-require-bank-branch');
+      $payinfo .= $cgi->param('payinfo2');
+      $cgi->param('payinfo',$payinfo);
   }
   $cgi->param('paydate',
     $cgi->param( 'exp_month' ). '-'. $cgi->param( 'exp_year' ) );
@@ -237,9 +240,15 @@ if ( $new->custnum eq '' ) {
   if ($new->stateid =~ /^xxx/) {
     $new->stateid($old->stateid);
   }
-  if ($new->payby =~ /^(CARD|DCRD)$/ && $new->payinfo =~ /xx/) {
+  if ( $new->payby =~ /^(CARD|DCRD)$/
+       && (    $new->payinfo =~ /xx/
+            || $new->payinfo =~ /^\s*N\/A\s+\(tokenized\)\s*$/
+          )
+     )
+  {
     $new->payinfo($old->payinfo);
-  } elsif ($new->payby =~ /^(CHEK|DCHK)$/ && $new->payinfo =~ /xx/) {
+
+  } elsif ( $new->payby =~ /^(CHEK|DCHK)$/ && $new->payinfo =~ /xx/ ) {
     #fix for #3085 "edit of customer's routing code only surprisingly causes
     #nothing to happen...
     # this probably won't do the right thing when we don't have the