summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2017-02-08 11:48:23 -0800
committerIvan Kohler <ivan@freeside.biz>2017-02-08 11:48:23 -0800
commita6f90db7a81b1cee5749e42878188577fa5d99b5 (patch)
tree934d840e2bcf79f391d89735d9f1483e77f0cb34
parentac8410cdb67639afeb84c84e975fffadf3e6cce1 (diff)
fix recurring display w/discounts, RT#41844
-rw-r--r--FS/FS/cust_main/Packages.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 3f4792e..7090ce7 100644
--- a/FS/FS/cust_main/Packages.pm
+++ b/FS/FS/cust_main/Packages.pm
@@ -602,6 +602,8 @@ this customer that are active (recurring).
=cut
+#recurring_pkgs? different from cust_pkg idea of "active" which has
+# a setup vs not_yet_billed which doesn't
sub active_pkgs {
my $self = shift;
grep { my $part_pkg = $_->part_pkg;
@@ -617,6 +619,8 @@ are active (recurring).
=cut
+#ncancelled_recurring_pkgs? different from cust_pkg idea of "active" which has
+# a setup vs not_yet_billed which doesn't
sub ncancelled_active_pkgs {
my $self = shift;
grep { my $part_pkg = $_->part_pkg;
@@ -871,7 +875,7 @@ sub display_recurring {
my $discount = $cust_pkg_discount->discount;
#and only one of these for each
$pkg_amount -= $discount->amount;
- $pkg_amount -= $amount * $discount->percent/100;
+ $pkg_amount -= $pkg_amount * $discount->percent/100;
}
$pkg_amount *= ( $cust_pkg->quantity || 1 );