[freeside-commits] branch FREESIDE_3_BRANCH updated. f2ccf00b0a2eb89499bd63cbd965fbd63802d754

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  f2ccf00b0a2eb89499bd63cbd965fbd63802d754 (commit)
      from  cbded596b87f700c427f7be3e746a90c561456c4 (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 f2ccf00b0a2eb89499bd63cbd965fbd63802d754
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jul 1 15:24:23 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 0a79ee5..656fa7f 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -23,7 +23,7 @@
   <TD BGCOLOR="#ffffff"><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)
@@ -63,7 +63,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
@@ -75,6 +75,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(-)