From 17470f0458a1cf5cf3ef7ebbcbbda836d37a7ee1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 17 Oct 2011 20:56:14 +0000
Subject: remove echeck-no_routing, never should have been there in the first
 place

---
 httemplate/misc/payment.cgi         | 18 +++++++-----------
 httemplate/misc/process/payment.cgi |  9 ++-------
 2 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'httemplate/misc')

diff --git a/httemplate/misc/payment.cgi b/httemplate/misc/payment.cgi
index 447cfa3c1..1797b29ba 100644
--- 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 acf066be9..e09cb570c 100644
--- 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;
   }
-- 
cgit v1.2.1