X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_introrate.pm;h=1fc9cd262e7a81d89f1b5813b809d6a559ed7f1c;hp=33cc3d48a52456be28a39457b745c9d6cc298013;hb=5fd15230317a0a6b6fcb70d5b83712c8f827ebb1;hpb=6231b4d0a5f2c78cca6ba10adb920b4ada986f14

diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index 33cc3d48a..1fc9cd262 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -1,12 +1,10 @@
 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;
+use vars qw( %info );
 
-@ISA = qw(FS::part_pkg::flat);
-$me = '[' . __PACKAGE__ . ']';
-$DEBUG = 0;
+use FS::Log;
 
 %info = (
   'name' => 'Introductory price for X months, then flat rate,'.
@@ -32,9 +30,12 @@ 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) {
-    die "Invalid intro_duration: " . $self->option('intro_duration');
+  my ($duration) = ($self->option('intro_duration') =~ /^\s*(\d+)\s*$/);
+  unless (length($duration)) {
+    my $log = FS::Log->new('FS::part_pkg');
+    $log->warning("Invalid intro_duration '".$self->option('intro_duration')."' on pkgpart ".$self->pkgpart
+                .", defaulting to 0, check package definition");
+    $duration = 0;
   }
   my $intro_end = $self->add_freq($cust_pkg->setup, $duration);