X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_bill.cgi;h=6bc499a350352fdfd65add5846c0bf1bf2a00e52;hb=0870a4c1fb02be43ea5524f58650d99c81477681;hp=4822ab718391f6a0f2f96014bf71d4c2986eb0b4;hpb=eb3bd392a89b8b666dc512951e78913c05b98810;p=freeside.git

diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 4822ab718..6bc499a35 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -25,7 +25,7 @@
 % }
 
 % if ( $cust_bill->owed > 0
-%      && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD) )
+%      && scalar( grep $payby{$_}, qw(BILL CASH WEST MCRD MCHK) )
 %      && $curuser->access_right(['Post payment', 'Post check payment', 'Post cash payment'])
 %      && ! $conf->exists('pkg-balances')
 %    )
@@ -54,6 +54,11 @@
           <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCRD;invnum=<% $invnum %>"><% mt('manual credit card') |h %></A>
 %     } 
 
+%     if ( $payby{'MCHK'} && $curuser->access_right(['Post payment']) ) { 
+          <% $s++ ? ' | ' : '' %>
+          <A HREF="<% $p %>edit/cust_pay.cgi?payby=MCHK;invnum=<% $invnum %>"><% mt('manual electronic check') |h %></A>
+%     } 
+
       <% mt('payment against this invoice') |h %><BR><BR>
 
 % } 
@@ -106,10 +111,6 @@
 <A HREF="<%$p%>search/cust_event.html?invnum=<% $cust_bill->invnum %>">( <% mt('View invoice events') |h %> )</A> 
 % }
 
-% if ( $cust_bill->num_cust_bill_event ) { $br++;
-<A HREF="<%$p%>search/cust_bill_event.cgi?invnum=<% $cust_bill->invnum %>">( <% mt('View deprecated, old-style invoice events') |h %> )</A> 
-% }
-
 % my @modes = grep {! $_->disabled} 
 %   $cust_bill->cust_main->agent->invoice_modes;
 % if ( @modes ) {
@@ -135,10 +136,10 @@ function change_invoice_mode(obj) {
 
 <% $br ? '<BR><BR>' : '' %>
 
-% if ( $conf->exists('invoice_html') ) { 
+% if ( $conf->exists('invoice_html') && ! $cgi->param('plaintext') ) { 
   <% join('', $cust_bill->print_html(\%opt) ) %>
 % } else { 
-  <PRE><% join('', $cust_bill->print_text(\%opt) ) %></PRE>
+  <PRE><% join('', $cust_bill->print_text(\%opt) ) |h %></PRE>
 % } 
 
 <& /elements/footer.html &>
@@ -173,8 +174,7 @@ my %opt = (
 $opt{'barcode_img'} = 1 if $conf->exists('invoice-barcode');
 
 my @payby =  grep /\w/, $conf->config('payby');
-#@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH WEST COMP ))
-@payby = (qw( CARD DCRD CHEK DCHK LECB BILL CASH COMP ))
+@payby = (qw( CARD DCRD CHEK DCHK BILL CASH ))
   unless @payby;
 my %payby = map { $_=>1 } @payby;