X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=0a79ee50cd23170d7633147b48ccecb533226620;hb=cbded596b87f700c427f7be3e746a90c561456c4;hp=b863a734bcff80e1ebe474c2fb6cd28c6899124b;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index b863a734b..0a79ee50c 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -23,6 +23,69 @@
<% $balance %> |
+% #54: just an arbitrary number i pulled out of my goober. in reality we'd want
+% # 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 ) {
+% my $sth = dbh->prepare("
+% SELECT DISTINCT freq FROM cust_pkg LEFT JOIN part_pkg USING (pkgpart)
+% WHERE freq IS NOT NULL AND freq != '0'
+% AND ( cancel IS NULL OR cancel = 0 )
+% AND custnum = ?
+% ") or die $DBI::errstr;
+%
+% $sth->execute($cust_main->custnum) or die $sth->errstr;
+
+% #not really a numeric sort because freqs can actually be all sorts of things
+% # but good enough for the 99% cases of ordering monthly quarterly annually
+% my @freqs = sort { $a <=> $b } map { $_->[0] } @{ $sth->fetchall_arrayref };
+%
+% foreach my $freq (@freqs) {
+% my @cust_pkg = qsearch({
+% 'table' => 'cust_pkg',
+% 'addl_from' => 'LEFT JOIN part_pkg USING (pkgpart)',
+% 'hashref' => { 'custnum' => $cust_main->custnum, },
+% 'extra_sql' => 'AND ( cancel IS NULL OR cancel = 0 )
+% AND freq = '. dbh->quote($freq),
+% }) or next;
+%
+% my $freq_pretty = $cust_pkg[0]->part_pkg->freq_pretty;
+%
+% my $amount = 0;
+% foreach my $cust_pkg (@cust_pkg) {
+% my $part_pkg = $cust_pkg->part_pkg;
+% next if $cust_pkg->susp
+% && ! $cust_pkg->option('suspend_bill')
+% && ( ! $part_pkg->option('suspend_bill')
+% || $cust_pkg->option('no_suspend_bill')
+% );
+%
+% #add recurring amounts for this package and its billing add-ons
+% foreach my $l_part_pkg ( $part_pkg->self_and_bill_linked ) {
+% $amount += $l_part_pkg->option('recur_fee');
+% }
+%
+% #subtract amounts for any active discounts
+% #(there should only be one at the moment, otherwise this makes no sense)
+% foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
+% my $discount = $cust_pkg_discount->discount;
+% #and only one of these for each
+% $amount -= $discount->amount;
+% $amount -= $amount * $discount->percent/100;
+% }
+%
+% }
+
+
+ <% emt( ucfirst($freq_pretty). ' recurring' ) %> |
+ <% $money_char. sprintf('%.2f', $amount) %> |
+
+
+% }
+
+% }
+
% if ( $conf->exists('cust_main-select-prorate_day') ) {
<% mt('Prorate day of month') |h %> |
@@ -221,7 +284,10 @@
% if ( $conf->exists('enable_taxproducts') ) {
<% mt('Tax location') |h %> |
- <% $cust_main->geocode('cch') %> |
+% my $tax_location = $conf->exists('tax-ship_address')
+% ? $cust_main->ship_location
+% : $cust_main->bill_location;
+ <% $tax_location->geocode('cch') %> |
% }
@@ -257,15 +323,27 @@
<% mt('Invoice terms') |h %> |
- <% $cust_main->invoice_terms || emt('Default').' ('. ( $conf->config('invoice_default_terms') || emt('Payable upon receipt') ). ')' %>
+ <% $cust_main->invoice_terms
+ || emt('Default').' ('. ( $conf->config('invoice_default_terms', $cust_main->agentnum)
+ || emt('Payable upon receipt')
+ ).
+ ')'
+ %>
|
<% mt('Credit limit') |h %> |
- <% length($cust_main->credit_limit) ?
- $money_char.sprintf("%.2f", $cust_main->credit_limit) :
- emt('Unlimited') %>
+% my $default_credit_limit = $conf->config('default_credit_limit');
+ <% length($cust_main->credit_limit)
+ ? $money_char. sprintf("%.2f", $cust_main->credit_limit)
+ : $default_credit_limit
+ ? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")"
+ : emt('Unlimited')
+ %>
+% if ( $cust_main->num_cust_main_credit_limit ) {
+ (incidents)
+% }
|