From a6f90db7a81b1cee5749e42878188577fa5d99b5 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 8 Feb 2017 11:48:23 -0800
Subject: [PATCH] fix recurring display w/discounts, RT#41844
---
FS/FS/cust_main/Packages.pm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm
index 3f4792e1a..7090ce765 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 );
--
2.20.1