projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac8410c
)
fix recurring display w/discounts, RT#41844
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 8 Feb 2017 19:48:23 +0000
(11:48 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 8 Feb 2017 19:48:23 +0000
(11:48 -0800)
FS/FS/cust_main/Packages.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main/Packages.pm
b/FS/FS/cust_main/Packages.pm
index
3f4792e
..
7090ce7
100644
(file)
--- 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
=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;
sub active_pkgs {
my $self = shift;
grep { my $part_pkg = $_->part_pkg;
@@
-617,6
+619,8
@@
are active (recurring).
=cut
=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;
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;
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 );
}
$pkg_amount *= ( $cust_pkg->quantity || 1 );