From f2ccf00b0a2eb89499bd63cbd965fbd63802d754 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Wed, 1 Jul 2015 15:24:23 -0700 Subject: [PATCH] fix "monthly recurring" display w/quantities, RT#36813 --- httemplate/view/cust_main/billing.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html index 0a79ee50c..656fa7fec 100644 --- a/httemplate/view/cust_main/billing.html +++ b/httemplate/view/cust_main/billing.html @@ -23,7 +23,7 @@ <% $balance %> -% #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 ); +% % } -- 2.11.0