X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_introrate.pm;h=733760276c7aeb866d51d414ef86f74eb2f66f20;hb=b7cf1606a66cca95e3540f803ffa66d223f23a40;hp=33cc3d48a52456be28a39457b745c9d6cc298013;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm index 33cc3d48a..733760276 100644 --- a/FS/FS/part_pkg/flat_introrate.pm +++ b/FS/FS/part_pkg/flat_introrate.pm @@ -1,12 +1,8 @@ package FS::part_pkg::flat_introrate; +use base qw( FS::part_pkg::flat ); use strict; -use vars qw(@ISA %info $DEBUG $me); -use FS::part_pkg::flat; - -@ISA = qw(FS::part_pkg::flat); -$me = '[' . __PACKAGE__ . ']'; -$DEBUG = 0; +use vars qw( %info ); %info = ( 'name' => 'Introductory price for X months, then flat rate,'. @@ -32,8 +28,8 @@ sub base_recur { warn "flat_introrate base_recur requires date!" if !$time; my $now = $time ? $$time : time; - my ($duration) = ($self->option('intro_duration') =~ /^(\d+)$/); - unless ($duration) { + my ($duration) = ($self->option('intro_duration') =~ /^\s*(\d+)\s*$/); + unless (length($duration)) { die "Invalid intro_duration: " . $self->option('intro_duration'); } my $intro_end = $self->add_freq($cust_pkg->setup, $duration);