diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-06-05 13:26:17 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-06-05 13:26:17 -0700 |
commit | 44aeae65935e8d018d995d4fadd225df9498848c (patch) | |
tree | 84dec2413a1d09d7bd8ccaa6a3592eee0c8c3039 /FS | |
parent | f97979ae5414521c852298d07a77764a0f24adea (diff) |
fix intro periods getting re-added on package change when delay_setup is on, RT#23440
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/cust_pkg.pm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 425fe6833..f770974f4 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -255,7 +255,8 @@ The following options are available: =item change -If set true, supresses any referral credit to a referring customer. +If set true, supresses actions that should only be taken for new package +orders. (Currently this includes: intro periods when delay_setup is on.) =item options @@ -303,8 +304,12 @@ sub insert { } } - my $free_days = $part_pkg->option('free_days',1); - if ( $free_days && $part_pkg->option('delay_setup',1) ) { #&& !$self->start_date + if ( ! $options{'change'} + && ( my $free_days = $part_pkg->option('free_days',1) ) + && $part_pkg->option('delay_setup',1) + #&& ! $self->start_date + ) + { my ($mday,$mon,$year) = (localtime(time) )[3,4,5]; #my $start_date = ($self->start_date || timelocal(0,0,0,$mday,$mon,$year)) + 86400 * $free_days; my $start_date = timelocal(0,0,0,$mday,$mon,$year) + 86400 * $free_days; |