[freeside-commits] freeside/FS/FS cust_main.pm, 1.464.2.49, 1.464.2.50

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv19507

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_main.pm 
Log Message:
fix late fee held for next invoice triggering immediately if next bill dates have been manually added to one-time charges, RT#10192

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.464.2.49
retrieving revision 1.464.2.50
diff -u -w -d -r1.464.2.49 -r1.464.2.50
--- cust_main.pm	30 Sep 2010 01:11:20 -0000	1.464.2.49
+++ cust_main.pm	13 Oct 2010 20:21:03 -0000	1.464.2.50
@@ -2186,6 +2186,21 @@
   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
@@ -2195,7 +2210,7 @@
 
 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