don't error out displaying customer reocrd if tax vendor is configured and customer...

[freeside.git] / httemplate / view / cust_main / billing.html

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index a94b5c1..5935da9 100644 (file)
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -31,8 +31,7 @@
      'subs' => [ 'get_display_recurring'] &>
 
 <SCRIPT>
-<&| /elements/onload.js &>
-get_display_recurring('custnum',<% $cust_main->custnum %>, function (xmlresult) {
+function set_display_recurring (xmlresult) {
   var recurring = JSON.parse(xmlresult);
   var rlabel = document.getElementById('recurring_label');
   var rvalue = document.getElementById('recurring_value');
@@ -63,14 +62,28 @@ get_display_recurring('custnum',<% $cust_main->custnum %>, function (xmlresult)
   } else {
     rrow.parentNode.removeChild(rrow);
   }
-});
-</&>
+}
 </SCRIPT>
 
+% # 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'] &>
+<SCRIPT>
+get_display_recurring('custnum',<% $cust_main->custnum %>,set_display_recurring);
+</SCRIPT>
+% } else {
+<SCRIPT>
+set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->display_recurring ]}) |js_string %>);
+</SCRIPT>
+% }
+
 % if ( $conf->exists('cust_main-select-prorate_day') ) {
 <TR>
   <TH ALIGN="right"><% mt('Prorate day of month') |h %></TH>
   <TD><% $cust_main->prorate_day %>
+  <% $cust_main->force_prorate_day && ('<i>'.emt('(applies to all packages)').'</i>') %>
   </TD>
 </TR>
 % }
@@ -119,13 +132,13 @@ get_display_recurring('custnum',<% $cust_main->custnum %>, function (xmlresult)
     </TR>
 % }
 
-% if ( $conf->config('tax_data_vendor') eq 'cch' ) {
+% if ( $conf->config('tax_data_vendor') ) {
 <TR>
   <TH ALIGN="right"><% mt('Tax location') |h %></TH>
 % my $tax_location = $conf->exists('tax-ship_address')
 %                    ? $cust_main->ship_location
 %                    : $cust_main->bill_location;
-  <TD><% $tax_location->geocode('cch') %></TD>
+  <TD><% $tax_location && $tax_location->geocode %></TD>
 </TR>
 % }
 <TR>
@@ -187,13 +200,6 @@ get_display_recurring('custnum',<% $cust_main->custnum %>, function (xmlresult)
   </TD>
 </TR>
 
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
-  <TR>
-    <TH ALIGN="right"><% mt('Spool CDRs') |h %></TH>
-    <TD><% $cust_main->spool_cdr ? $yes : $no %></TD>
-  </TR>
-% } 
-
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
   <TR>
     <TH ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TH>