[freeside-commits] branch FREESIDE_3_BRANCH updated. c878f595e11f510058671b146e08c250766cd1bf

Jonathan Prykop jonathan at 420.am
Sat Sep 19 19:59:56 PDT 2015


The branch, FREESIDE_3_BRANCH has been updated
       via  c878f595e11f510058671b146e08c250766cd1bf (commit)
       via  fe6ddc9940cf3a55b4c37f360a31b90e92e4157d (commit)
      from  2581d8f2341ac8def1a712cfe70543ec5f7b0959 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c878f595e11f510058671b146e08c250766cd1bf
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Sat Sep 19 19:36:55 2015 -0500

    RT#36813: Monthly Recurring Total [fixed order by]

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 74484e3..cc58cd7 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -48,7 +48,7 @@
 %       '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
+%       '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;

commit fe6ddc9940cf3a55b4c37f360a31b90e92e4157d
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Sep 16 01:59:07 2015 -0500

    RT#36813: Monthly Recurring Total [change_to_pkgnum handling]

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index ca48a70..74484e3 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -48,11 +48,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
@@ -61,6 +63,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

-----------------------------------------------------------------------

Summary of changes:
 httemplate/view/cust_main/billing.html |   11 +++++++++++
 1 file changed, 11 insertions(+)




More information about the freeside-commits mailing list