X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=29ed2c760f31ba2e2809af0609274902a43f237e;hb=5b0df166c22e13eba83fabee858846ead6a54141;hp=894b2dfc0ac1abe2ec5f5daa526d787ff49e20a6;hpb=a2ecb1cf6a6c084c521710f1256da082f70ba9e5;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 894b2dfc0..29ed2c760 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -21,23 +21,69 @@
<% $balance %> |
-% #54: just an arbitrary number i pulled out of my goober. ideally we'd like
-% # to consider e.g. a histogram of num_ncancelled_packages for the entire
-% # customer base, and compare it to a graph of the overhead for generating this
-% # information. (and optimize it better, we could get it more from SQL)
-% if ( $cust_main->num_ncancelled_pkgs < 54 ) {
-% foreach my $freq_info ($cust_main->display_recurring) {
-
- <% emt( ucfirst($freq_info->{'freq_pretty'}). ' recurring' ) %> |
- <% $money_char. sprintf('%.2f', $freq_info->{'amount'}) %> |
-
-% }
+
+ <% emt( 'Recurring' ) %> |
+ ![](<% $fsurl %>images/wait-orange.gif) |
+
+
+<& '/elements/xmlhttp.html',
+ 'url' => $fsurl.'misc/xmlhttp-cust_main-display_recurring.html',
+ 'subs' => [ 'get_display_recurring'] &>
+
+
+
+% # 10 is an arbitrary number, use ajax for customers with many packages
+% if ( $cust_main->num_billing_pkgs > 10 ) {
+<& '/elements/xmlhttp.html',
+ 'url' => $fsurl.'misc/xmlhttp-cust_main-display_recurring.html',
+ 'subs' => [ 'get_display_recurring'] &>
+
+% } else {
+
% }
% if ( $conf->exists('cust_main-select-prorate_day') ) {
<% mt('Prorate day of month') |h %> |
<% $cust_main->prorate_day %>
+ <% $cust_main->force_prorate_day && (''.emt('(applies to all packages)').'') %>
|
% }
@@ -86,13 +132,13 @@
% }
-% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
+% if ( $conf->config('tax_data_vendor') ) {
<% mt('Tax location') |h %> |
% my $tax_location = $conf->exists('tax-ship_address')
% ? $cust_main->ship_location
% : $cust_main->bill_location;
- <% $tax_location->geocode('cch') %> |
+ <% $tax_location && $tax_location->geocode %> |
% }
@@ -121,6 +167,12 @@
<% $cust_main->invoice_noemail ? $refused : $allowed %> |
% }
+% if ( $conf->config_bool('allow_payment_receipt_noemail', $cust_main->agentnum) ) {
+
+ <% mt('Email payment receipts') |h %> |
+ <% $cust_main->paymentreceipt_noemail ? $refused : $allowed %> |
+
+% }
<% mt('Other email notices') |h %> |
@@ -154,13 +206,6 @@
|
-% if ( $conf->exists('voip-cust_cdr_spools') ) {
-
- <% mt('Spool CDRs') |h %> |
- <% $cust_main->spool_cdr ? $yes : $no %> |
-
-% }
-
% if ( $conf->exists('voip-cust_cdr_squelch') ) {
<% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %> |