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/view/cust_main/billing.html         | 10 ++++------
 httemplate/view/cust_main/payment_history.html |  6 +-----
 2 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'httemplate/view')

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 09c0b4d1d..1e7adf000 100644
--- 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 24988eae4..64a708976 100644
--- 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);
-- 
cgit v1.2.1