remove echeck-no_routing, never should have been there in the first place

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d6da596..bee1770 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3024,13 +3024,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'echeck-no_routing',
-    'section'     => 'billing',
-    'description' => 'Disable the routing number entirely for Electronic Check payment info.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'voip-cust_accountcode_cdr',
     'section'     => 'telephony',
     'description' => 'Enable the per-customer option for CDR breakdown by accountcode.',

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index dc60baa..49702f6 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -1954,9 +1954,6 @@ sub check {
     if ( $conf->exists('cust_main-require-bank-branch') ) {
       $payinfo =~ /^(\d+)\@(\d+)\.(\d+)$/ or return 'invalid echeck account@branch.bank';
       $payinfo = "$1\@$2.$3";
-    } elsif ( $conf->exists('echeck-no_routing') ) {
-      $payinfo =~ /^(\d+)\@(\d*)$/ or return 'invalid echeck account';
-      $payinfo = "$1\@$2";
     } elsif ( $conf->exists('echeck-nonus') ) {
       $payinfo =~ /^(\d+)\@(\d+)$/ or return 'invalid echeck account@aba';
       $payinfo = "$1\@$2";

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 294104b..7f7a232 100644 (file)
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -234,15 +234,10 @@
 %            join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes).
 %          qq!</SELECT></TD></TR>!.
 %
-%        ( $conf->exists('echeck-no_routing')
-%          ? '<INPUT TYPE="hidden" NAME="CHEK_payinfo2" VALUE="'.
-%              ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). '">'
-%          :
-%            qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('ABA/Routing number').qq! </TD>!.
-%              qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
-%              qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">!.emt('help').qq!</A>)!.
-%              qq!</TD></TR>!
-%        ).
+%        qq!<TR><TD ALIGN="right" WIDTH="200">${r}!.emt('ABA/Routing number').qq! </TD>!.
+%          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="CHEK_payinfo2" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $aba : '' ). qq!" SIZE=10 MAXLENGTH=9> !.
+%          qq!(<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;">!.emt('help').qq!</A>)!.
+%          qq!</TD></TR>!.
 %
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_month" VALUE="12">!.
 %        qq!<INPUT TYPE="hidden" NAME="CHEK_exp_year" VALUE="2037">!.

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 447cfa3..1797b29 100644 (file)
--- a/httemplate/misc/payment.cgi
+++ b/httemplate/misc/payment.cgi
@@ -154,17 +154,13 @@
       <TD ALIGN="right"><% mt('Type') |h %></TD>
       <TD><SELECT NAME="paytype"><% join('', map { qq!<OPTION VALUE="$_" !.($paytype eq $_ ? 'SELECTED' : '').">$_</OPTION>" } @FS::cust_main::paytypes) %></SELECT></TD>
     </TR>
-%   if ( $conf->exists('echeck-no_routing') ) {
-      <INPUT TYPE="text" NAME="payinfo2" VALUE="<%$payinfo2%>">
-%   } else {
-      <TR>
-        <TD ALIGN="right"><% mt('ABA/Routing number') |h %></TD>
-        <TD>
-          <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%$payinfo2%>">
-          (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)
-        </TD>
-      </TR>
-%   }
+    <TR>
+      <TD ALIGN="right"><% mt('ABA/Routing number') |h %></TD>
+      <TD>
+        <INPUT TYPE="text" SIZE=10 MAXLENGTH=9 NAME="payinfo2" VALUE="<%$payinfo2%>">
+        (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('../docs/ach.html', 380, 240, 'ach_popup' ), CAPTION, 'ACH Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)
+      </TD>
+    </TR>
     <TR>
       <TD ALIGN="right"><% mt('Bank name') |h %></TD>
       <TD><INPUT TYPE="text" NAME="payname" VALUE="<%$payname%>"></TD>

diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi
index acf066b..e09cb57 100644 (file)
--- a/httemplate/misc/process/payment.cgi
+++ b/httemplate/misc/process/payment.cgi
@@ -83,13 +83,8 @@ if ( $payby eq 'CHEK' ) {
     $cgi->param('payinfo1') =~ /^(\d+)$/
       or errorpage("illegal account number ". $cgi->param('payinfo1'));
     my $payinfo1 = $1;
-    if ( $conf->exists('echeck-no_routing') ) {
-      $cgi->param('payinfo2') =~ /^(\d*)$/
-        or errorpage("illegal ABA/routing number ". $cgi->param('payinfo2'));
-    } else {
-      $cgi->param('payinfo2') =~ /^(\d+)$/
-        or errorpage("illegal ABA/routing number ". $cgi->param('payinfo2'));
-    }
+    $cgi->param('payinfo2') =~ /^(\d+)$/
+      or errorpage("illegal ABA/routing number ". $cgi->param('payinfo2'));
     my $payinfo2 = $1;
     $payinfo = $payinfo1. '@'. $payinfo2;
   }

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 09c0b4d..1e7adf0 100644 (file)
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -93,12 +93,10 @@
   </TD>
 </TR>
 
-% unless ( $conf->exists('echeck-no_routing') ) {
-  <TR>
-    <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
-    <TD BGCOLOR="#ffffff"><% $aba %></TD>
-  </TR>
-% }
+<TR>
+  <TD ALIGN="right"><% mt('ABA/Routing code') |h %></TD>
+  <TD BGCOLOR="#ffffff"><% $aba %></TD>
+</TR>
 
 % if ( $conf->exists('cust_main-require-bank-branch') ) {
 <TR>

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 24988ea..64a7089 100644 (file)
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -513,11 +513,7 @@ sub translate_payinfo {
         $payinfo = $object->paymask;
     } elsif ( $payby eq 'CHEK' ) {
         my( $account, $aba ) = split('@', $object->paymask );
-        if ( $conf->exists('echeck-no_routing') ) {
-          $payinfo = emt("Acct #[_1]", $account);
-        } else {
-          $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
-        }
+        $payinfo = emt("ABA [_1], Acct #[_2]",$aba,$account);
     }
 
     ($payby,$payinfo);