projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb8d993
)
fix late fee held for next invoice triggering immediately if next bill dates have...
author
ivan
<ivan>
Wed, 13 Oct 2010 20:20:34 +0000
(20:20 +0000)
committer
ivan
<ivan>
Wed, 13 Oct 2010 20:20:34 +0000
(20:20 +0000)
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
316ae37
..
ab7bde3
100644
(file)
--- a/
FS/FS/cust_main/Packages.pm
+++ b/
FS/FS/cust_main/Packages.pm
@@
-385,6
+385,21
@@
sub unsuspended_pkgs {
grep { ! $_->susp } $self->ncancelled_pkgs;
}
grep { ! $_->susp } $self->ncancelled_pkgs;
}
+=item active_pkgs
+
+Returns all unsuspended (and uncancelled) packages (see L<FS::cust_pkg>) for
+this customer that are active (recurring).
+
+=cut
+
+sub active_pkgs {
+ my $self = shift;
+ grep { my $part_pkg = $_->part_pkg;
+ $part_pkg->freq ne '' && $part_pkg->freq ne '0';
+ }
+ $self->unsuspended_pkgs;
+}
+
=item next_bill_date
Returns the next date this customer will be billed, as a UNIX timestamp, or
=item next_bill_date
Returns the next date this customer will be billed, as a UNIX timestamp, or
@@
-394,7
+409,7
@@
undef if no active package has a next bill date.
sub next_bill_date {
my $self = shift;
sub next_bill_date {
my $self = shift;
- min( map $_->get('bill'), grep $_->get('bill'), $self->
unsuspended
_pkgs );
+ min( map $_->get('bill'), grep $_->get('bill'), $self->
active
_pkgs );
}
=item num_cancelled_pkgs
}
=item num_cancelled_pkgs