summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2015-09-16 01:59:07 -0500
committerJonathan Prykop <jonathan@freeside.biz>2015-09-19 21:46:41 -0500
commit64a2c644f1cb10cf1c37ef1941dc3406f21d94ed (patch)
tree777bf6a0d7bd8cb215e81590fd7100aecd31cf7b /httemplate/view
parent77a4ccff7384368888fe88379f01f9ddc34244d8 (diff)
RT#36813: Monthly Recurring Total [change_to_pkgnum handling]
Diffstat (limited to 'httemplate/view')
-rw-r--r--httemplate/view/cust_main/billing.html11
1 files changed, 11 insertions, 0 deletions
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index c031ce929..f7ea68a65 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -44,11 +44,13 @@
% 'hashref' => { 'custnum' => $cust_main->custnum, },
% 'extra_sql' => 'AND ( cancel IS NULL OR cancel = 0 )
% AND freq = '. dbh->quote($freq),
+% 'order_by' => 'ORDER BY 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
@@ -57,6 +59,15 @@
% || $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