X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=aea90e8b32ee8df4936e85a07752b7e76d878228;hb=efc68f41987d007de5e792b88df1c63bf3dedf4c;hp=d1be8936fb5c2de82bea8fe750e5afa30aa8a697;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index d1be8936f..aea90e8b3 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -1,19 +1,17 @@
-%
-%  my( $cust_main ) = @_;
-%  my @invoicing_list = $cust_main->invoicing_list;
-%  my $conf = new FS::Conf;
-%  my $money_char = $conf->config('money_char') || '$';
-%
-
-
 Billing information
-(<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+%# If we can't see the unencrypted card, then bill now is an exercise in
+%# frustration (without some sort of job queue magic to send it to a secure
+%# machine, anyway)
+%if (  $FS::CurrentUser::CurrentUser->access_right('Bill customer now')
+%      && ! $cust_main->is_encrypted($cust_main->payinfo)
+%   ) { 
+  (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+% } 
+
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
-%
+
 %( my $balance = $cust_main->balance )
 %  =~ s/^(\-?)(.*)$/<FONT SIZE=+1>$1<\/FONT>$money_char$2/;
-%
-
 
 <TR>
   <TD ALIGN="right">Balance due</TD>
@@ -31,7 +29,7 @@ Billing information
 </TR>
 <TR>
   <TD ALIGN="right">Card number</TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->payinfo_masked %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->paymask %></TD>
 </TR>
 %
 %#false laziness w/elements/select-month_year.html & edit/cust_main/billing.html
@@ -71,8 +69,7 @@ Billing information
   <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
 % } elsif ( $cust_main->payby eq 'CHEK' || $cust_main->payby eq 'DCHK') {
-%     my( $account, $aba ) = split('@', $cust_main->payinfo );
-%
+%     my( $account, $aba ) = split('@', $cust_main->paymask );
 
 
     Electronic&nbsp;check&nbsp;<% $cust_main->payby eq 'CHEK' ? '(automatic)' : '(on-demand)' %>
@@ -84,12 +81,22 @@ Billing information
 </TR>
 <TR>
   <TD ALIGN="right">Account number</TD>
-  <TD BGCOLOR="#ffffff"><% 'x'x(length($account)-2). substr($account,(length($account)-2)) %></TD>
+  <TD BGCOLOR="#ffffff"><% $account %></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Account type</TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->paytype %></TD>
 </TR>
 <TR>
   <TD ALIGN="right">Bank name</TD>
   <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
 </TR>
+% if ( $conf->exists('show_bankstate') ) {
+<TR>
+  <TD ALIGN="right"><% $paystate_label %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->paystate || '&nbsp;&nbsp;&nbsp;' %></TD>
+</TR>
+% }
 % } elsif ( $cust_main->payby eq 'LECB' ) {
 %     $cust_main->payinfo =~ /^(\d{3})(\d{3})(\d{4})$/;
 %     my $payinfo = "$1-$2-$3";
@@ -175,14 +182,39 @@ Billing information
     <% join(', ', grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list ) || 'no' %>
   </TD>
 </TR>
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
+<TR>
+  <TD ALIGN="right">Invoice&nbsp;terms</TD>
+  <TD BGCOLOR="#ffffff">
+    <% $cust_main->invoice_terms || 'Default ('. ( $conf->config('invoice_default_terms') || 'Payable upon receipt' ). ')' %>
+  </TD>
+</TR>
 
+% if ( $conf->exists('voip-cust_cdr_spools') ) { 
   <TR>
     <TD ALIGN="right">Spool&nbsp;CDRs</TD>
     <TD BGCOLOR="#ffffff"><% $cust_main->spool_cdr ? 'yes' : 'no' %></TD>
   </TR>
 % } 
 
+% if ( $conf->exists('voip-cust_cdr_squelch') ) { 
+  <TR>
+    <TD ALIGN="right">Print&nbsp;CDRs</TD>
+    <TD BGCOLOR="#ffffff"><% $cust_main->squelch_cdr ? 'no' : 'yes' %></TD>
+  </TR>
+% } 
 
 </TABLE></TD></TR></TABLE>
+<%once>
+
+my $paystate_label = FS::Msgcat::_gettext('paystate');
+$paystate_label = 'Bank state' if $paystate_label =~/^paystate$/;
+
+</%once>
+<%init>
+
+my( $cust_main ) = @_;
+my @invoicing_list = $cust_main->invoicing_list;
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
 
+</%init>