X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpayment_history.html;h=752f5656282a328654b2f73524c217c90c69b16f;hb=e3fe71c58c8780ce3f88c417931b455236b26529;hp=580a30751a4355be052ca694804773715ddb1b91;hpb=3d62ec9362d0b22c17a17da6197f8b2fc219a54e;p=freeside.git

diff --git a/httemplate/view/cust_main/payment_history.html b/httemplate/view/cust_main/payment_history.html
index 580a30751..752f56562 100644
--- a/httemplate/view/cust_main/payment_history.html
+++ b/httemplate/view/cust_main/payment_history.html
@@ -396,6 +396,15 @@ my %opt = (
   )
 );
 
+#legacy invoices
+foreach my $legacy_cust_bill ($cust_main->legacy_cust_bill) {
+  push @history, {
+    'date'   => $legacy_cust_bill->_date,
+    'desc'   => include('payment_history/legacy_invoice.html', $legacy_cust_bill, %opt ),
+    'charge' => $legacy_cust_bill->charged,
+  };
+}
+
 #invoices
 foreach my $cust_bill ($cust_main->cust_bill) {
   push @history, {
@@ -507,15 +516,13 @@ sub translate_payinfo {
     my $payby = $object->payby;
     my $payinfo = $object->payinfo;
 
+    my $conf = new FS::Conf;
+
     if ( $payby eq 'CARD' ) {
         $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);