[freeside-commits] branch master updated. bba2d3e97b173983eebc9ade920ac0a0468c16d7

[Ivan]

The branch, master has been updated
       via  bba2d3e97b173983eebc9ade920ac0a0468c16d7 (commit)
      from  b43d0bcba176dd04e052b583d4d9c6f540c33b43 (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 bba2d3e97b173983eebc9ade920ac0a0468c16d7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jul 1 15:24:19 2015 -0700

    fix "monthly recurring" display w/quantities, RT#36813

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 2f164df..6be9545 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -19,7 +19,7 @@
   <TD><B><% $balance %></B></TD>
 </TR>
 
-% #54: just an arbitrary number i pulled out of my goober.  in reality we'd want
+% #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)
@@ -59,7 +59,7 @@
 %
 %       #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');
+%         $amount += $l_part_pkg->base_recur;
 %       }
 %
 %       #subtract amounts for any active discounts
@@ -71,6 +71,8 @@
 %         $amount -= $amount * $discount->percent/100;
 %       }
 %
+%       $amount *= ( $cust_pkg->quantity || 1 );
+%
 %     }
    
       <TR>

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

Summary of changes:
 httemplate/view/cust_main/billing.html |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)