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

[freeside.git] / FS / FS / part_pkg / flat_introrate.pm

diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index 1447730..7337602 100644 (file)
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -1,14 +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;
-
-use Date::Manip qw(DateCalc UnixDate ParseDate);
-
-@ISA = qw(FS::part_pkg::flat);
-$me = '[' . __PACKAGE__ . ']';
-$DEBUG = 0;
+use vars qw( %info );
 
 %info = (
   'name' => 'Introductory price for X months, then flat rate,'.
@@ -31,29 +25,21 @@ $DEBUG = 0;
 sub base_recur {
   my($self, $cust_pkg, $time ) = @_;
 
+  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);
 
-  my $setup = &ParseDate('epoch ' . $cust_pkg->getfield('setup'));
-  my $intro_end = &DateCalc($setup, "+${duration} month");
-  my $recur;
-
-  warn "$me: \$duration = ${duration}" if $DEBUG;
-  warn "$me: \$intro_end = ${intro_end}" if $DEBUG;
-  warn "$me: $now < " . &UnixDate($intro_end, '%s') if $DEBUG;
-
-  if ($now < &UnixDate($intro_end, '%s')) {
-    $recur = $self->option('intro_fee');
+  if ($now < $intro_end) {
+    return $self->option('intro_fee');
   } else {
-    $recur = $self->option('recur_fee');
+    return $self->option('recur_fee');
   }
 
-  $recur;
-
 }