Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / part_event / Condition / billday.pm

diff --git a/FS/FS/part_event/Condition/billday.pm b/FS/FS/part_event/Condition/billday.pm
index b150a6c..078166d 100644 (file)
--- a/FS/FS/part_event/Condition/billday.pm
+++ b/FS/FS/part_event/Condition/billday.pm
@@ -6,25 +6,48 @@ use Tie::IxHash;
 use base qw( FS::part_event::Condition );
 
 sub description {
-  "Customer's monthly billing day matches current day or customer has no billing day";
+  "Customer's monthly billing day is before or on current day or customer has no billing day";
+}
+
+sub option_fields {
+  (
+    'delay' => { label  => 'Delay additional days',
+                 type   => 'text',
+                 value  => '0',
+               },
+  );
 }
 
 sub condition {
-  my( $self, $object ) = @_;
+  my( $self, $object, %opt ) = @_;
 
   my $cust_main = $self->cust_main($object);
 
-  my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+  my $delay = $self->option('delay') || 0;
+  my $as_of = $opt{'time'} - $delay * 86400; # $opt{'time'}, not time()
 
-  ($mday == $cust_main->billday) || (!$cust_main->billday);
+  my ($mday) = (localtime($as_of))[3]; # what day it was $delay days before now
+  
+  (!$cust_main->billday) || ($mday >= $cust_main->billday);
 }
 
 sub condition_sql {
-  my( $self, $table ) = @_;
-
-  my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-  "cust_main.billday is null or cust_main.billday = $mday";
+  my( $class, $table, %opt ) = @_;
+  my $delay = $class->condition_sql_option_integer('delay', 
+    $opt{'driver_name'}); # returns 0 for null
+  my $as_of = $opt{'time'} . " - ($delay * 86400)"; # in seconds
+  my $mday;
+  if ( $opt{'driver_name'} eq 'Pg' ) {
+    $mday = "EXTRACT( DAY FROM TO_TIMESTAMP($as_of) )";
+  }
+  elsif ( $opt{'driver_name'} eq 'mysql' ) {
+    $mday = "DAY( FROM_UNIXTIME($as_of) )";
+  }
+  else { 
+    return 'true'
+  }
+  
+  "cust_main.billday is null or $mday >= cust_main.billday";
 }
 
 1;