projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e4b86a
)
fix late fee holding until next invoice w/suspended packages set to bill while suspen...
author
ivan
<ivan>
Tue, 26 Jul 2011 01:25:29 +0000
(
01:25
+0000)
committer
ivan
<ivan>
Tue, 26 Jul 2011 01:25:29 +0000
(
01:25
+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
4b44fdd
..
c75b99f
100644
(file)
--- a/
FS/FS/cust_main/Packages.pm
+++ b/
FS/FS/cust_main/Packages.pm
@@
-395,16
+395,32
@@
sub active_pkgs {
$self->unsuspended_pkgs;
}
$self->unsuspended_pkgs;
}
+=item billing_pkgs
+
+Returns active packages, and also any suspended packages which are set to
+continue billing while suspended.
+
+=cut
+
+sub billing_pkgs {
+ my $self = shift;
+ grep { my $part_pkg = $_->part_pkg;
+ $part_pkg->freq ne '' && $part_pkg->freq ne '0'
+ && ( ! $_->susp || $part_pkg->option('suspend_bill', 1) );
+ }
+ $self->ncancelled_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
-undef if no
active
package has a next bill date.
+undef if no
billing
package has a next bill date.
=cut
sub next_bill_date {
my $self = shift;
=cut
sub next_bill_date {
my $self = shift;
- min( map $_->get('bill'), grep $_->get('bill'), $self->
active
_pkgs );
+ min( map $_->get('bill'), grep $_->get('bill'), $self->
billing
_pkgs );
}
=item num_cancelled_pkgs
}
=item num_cancelled_pkgs