X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fbilling.html;h=3d0983e67854eb9c3556a5ccd3ee563eff96e6f9;hb=213d2aee192d0aa9ccf5d2caa6bdb09611686901;hp=749004d846b22d51e5fd866b0f3b408d2271b9cb;hpb=ad9229b8b2934caa4af464e26cdb3349fb2e759b;p=freeside.git
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 749004d84..3d0983e67 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -23,6 +23,86 @@
<% $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 ) {
+% 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),
+% 'order_by' => 'ORDER BY COALESCE(start_date,0), pkgnum', # to ensure old pkgs come before change_to_pkg
+% }) or next;
+%
+% my $freq_pretty = $cust_pkg[0]->part_pkg->freq_pretty;
+%
+% my $amount = 0;
+% my $skip_pkg = {};
+% 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')
+% );
+%
+% #pkg change handling
+% next if $skip_pkg->{$cust_pkg->pkgnum};
+% if ($cust_pkg->change_to_pkgnum) {
+% #if change is on or before next bill date, use new pkg
+% next if $cust_pkg->expire <= $cust_pkg->bill;
+% #if change is after next bill date, use old (this) pkg
+% $skip_pkg->{$cust_pkg->change_to_pkgnum} = 1;
+% }
+%
+% my $pkg_amount = 0;
+%
+% #add recurring amounts for this package and its billing add-ons
+% foreach my $l_part_pkg ( $part_pkg->self_and_bill_linked ) {
+% $pkg_amount += $l_part_pkg->base_recur($cust_pkg);
+% }
+%
+% #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
+% $pkg_amount -= $discount->amount;
+% $pkg_amount -= $amount * $discount->percent/100;
+% }
+%
+% $pkg_amount *= ( $cust_pkg->quantity || 1 );
+%
+% $amount += $pkg_amount;
+%
+% }
+
+
+ <% emt( ucfirst($freq_pretty). ' recurring' ) %> |
+ <% $money_char. sprintf('%.2f', $amount) %> |
+
+
+% }
+
+% }
+
% if ( $conf->exists('cust_main-select-prorate_day') ) {
<% mt('Prorate day of month') |h %> |
@@ -260,7 +340,12 @@
<% 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')
+ ).
+ ')'
+ %>
|
@@ -273,6 +358,9 @@
? "Default ($money_char". sprintf("%.2f", $default_credit_limit). ")"
: emt('Unlimited')
%>
+% if ( $cust_main->num_cust_main_credit_limit ) {
+ (incidents)
+% }
@@ -297,9 +385,9 @@
% }
-% if ( $conf->exists('voip-cust_email_csv_cdr') ) {
+% if ( my $attach = $conf->config('voip-cdr_email_attach') ) {
- <% mt('Email CDRs as CSV') |h %> |
+ <% mt('Email CDRs as '.uc($attach)) |h %> |
<% $cust_main->email_csv_cdr ? $yes : $no %> |
% }