Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / view / cust_main / billing.html

diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 2f164df..c031ce9 100644 (file)
--- 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)
@@ -57,9 +57,11 @@
 %                 || $cust_pkg->option('no_suspend_bill')
 %               );
 %
+%       my $pkg_amount = 0;
+%
 %       #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');
+%         $pkg_amount += $l_part_pkg->base_recur($cust_pkg);
 %       }
 %
 %       #subtract amounts for any active discounts
@@ -67,10 +69,14 @@
 %       foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
 %         my $discount = $cust_pkg_discount->discount;
 %         #and only one of these for each
-%         $amount -= $discount->amount;
-%         $amount -= $amount * $discount->percent/100;
+%         $pkg_amount -= $discount->amount;
+%         $pkg_amount -= $amount * $discount->percent/100;
 %       }
 %
+%       $pkg_amount *= ( $cust_pkg->quantity || 1 );
+%
+%       $amount += $pkg_amount;
+%
 %     }
    
       <TR>