X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=c770833ecdb15ac86156ae7e33f64827de60ca9b;hp=c8d0c47cd0600e33ab4410b2873844911e332e20;hb=9d5ada5763fdeca4f90a7357ab7c384b52c1c41c;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index c8d0c47cd..c770833ec 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -5,7 +5,12 @@ Billing information
 %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>)
+%#  (<A HREF="<% $p %>misc/bill.cgi?<% $cust_main->custnum %>">Bill now</A>)
+  (<% include('/elements/bill.html',
+                custnum   => $cust_main->custnum,
+                label     => 'Bill now',
+                url       => $p.'view/cust_main.cgi?'.$cust_main->custnum,
+  ) %>)
 % } 
 
 <% ntable("#cccccc") %><TR><TD><% ntable("#cccccc",2) %>
@@ -18,6 +23,15 @@ Billing information
   <TD BGCOLOR="#ffffff"><B><% $balance %></B></TD>
 </TR>
 
+% if ( $conf->exists('cust_main-select-billday') 
+%    && ($cust_main->payby eq 'CARD' || $cust_main->payby eq 'CHEK') ) {
+<TR>
+  <TD ALIGN="right">Billing day of month</TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->billday %>
+  </TD>
+</TR>
+% }
+
 <TR>
   <TD ALIGN="right">Billing&nbsp;type</TD>
   <TD BGCOLOR="#ffffff">
@@ -127,7 +141,7 @@ Billing information
 
 <TR>
   <TD ALIGN="right">Attention</TD>
-  <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
+  <TD BGCOLOR="#ffffff"><% $cust_main->payname |h %></TD>
 </TR>
 % } elsif ( $cust_main->payby eq 'COMP' ) { 
 
@@ -201,6 +215,14 @@ Billing information
     <% $cust_main->invoice_terms || 'Default ('. ( $conf->config('invoice_default_terms') || 'Payable upon receipt' ). ')' %>
   </TD>
 </TR>
+<TR>
+  <TD ALIGN="right">Credit&nbsp;limit</TD>
+  <TD BGCOLOR="#ffffff">
+    <% length($cust_main->credit_limit) ? 
+        $money_char.sprintf("%.2f", $cust_main->credit_limit) :
+        'Unlimited' %>
+  </TD>
+</TR>
 
 % if ( $conf->exists('voip-cust_cdr_spools') ) { 
   <TR>
@@ -216,6 +238,13 @@ Billing information
   </TR>
 % } 
 
+% if ( $conf->exists('voip-cust_accountcode_cdr') ) { 
+   <TR>
+     <TD ALIGN="right">Breakdown CDRs by accountcode</TD>
+     <TD BGCOLOR="#ffffff"><% $cust_main->accountcode_cdr ? 'yes' : 'no' %></TD>
+   </TR>
+% }
+
 % if ( $conf->exists('voip-cust_email_csv_cdr') ) { 
   <TR>
     <TD ALIGN="right">Email&nbsp;CDRs&nbsp;as&nbsp;CSV</TD>