X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fdelayed_Mixin.pm;h=751a7235728b6a440b4c5479c684fc0258dfbf11;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hp=4228a4a3d22e5cbb2eb4c8de359b0c654f24bfa4;hpb=a78d8300b4be8ff4fbb4b5c64139d4c442b16c2f;p=freeside.git

diff --git a/FS/FS/part_pkg/delayed_Mixin.pm b/FS/FS/part_pkg/delayed_Mixin.pm
index 4228a4a3d..751a72357 100644
--- a/FS/FS/part_pkg/delayed_Mixin.pm
+++ b/FS/FS/part_pkg/delayed_Mixin.pm
@@ -1,8 +1,9 @@
 package FS::part_pkg::delayed_Mixin;
-use base qw( FS::part_pkg );
 
 use strict;
 use vars qw(%info);
+use Time::Local qw(timelocal);
+use NEXT;
 
 %info = (
   'disabled' => 1,
@@ -23,7 +24,8 @@ use vars qw(%info);
 );
 
 sub calc_setup {
-  my($self, $cust_pkg, $time ) = @_;
+  my $self = shift;
+  my( $cust_pkg, $time ) = @_;
 
   unless ( $self->option('delay_setup', 1) ) {
     my $d = $cust_pkg->bill || $time;
@@ -31,7 +33,7 @@ sub calc_setup {
     $cust_pkg->bill($d);
   }
   
-  $self->option('setup_fee');
+  $self->NEXT::calc_setup(@_);
 }
 
 sub calc_remain {
@@ -46,9 +48,23 @@ sub calc_remain {
                 && $last_bill == $cust_pkg->setup;
   }
 
-  return $self->SUPER::calc_remain($cust_pkg, %options);
+  return $self->NEXT::calc_remain($cust_pkg, %options);
 }
 
-sub can_start_date { ! shift->option('delay_setup', 1) }
+sub can_start_date {
+  my $self = shift;
+  ! $self->option('delay_setup', 1) && $self->NEXT::can_start_date(@_);
+}
+
+sub default_start_date {
+  my $self = shift;
+  if ( $self->option('delay_setup') and $self->option('free_days') ) {
+    my $delay = $self->option('free_days');
+
+    my ($mday, $mon, $year) = (localtime(time))[3,4,5];
+    return timelocal(0,0,0,$mday,$mon,$year) + 86400 * $self->option('free_days');
+  }
+  return $self->NEXT::default_start_date(@_);
+}
 
 1;