This commit was generated by cvs2svn to compensate for changes in r11022,

[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 2d551f1..33cc3d4 100644 (file)
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -2,58 +2,48 @@ package FS::part_pkg::flat_introrate;
 
 use strict;
 use vars qw(@ISA %info $DEBUG $me);
-#use FS::Record qw(qsearch qsearchs);
 use FS::part_pkg::flat;
 
-use Date::Manip qw(DateCalc UnixDate ParseDate);
-
 @ISA = qw(FS::part_pkg::flat);
 $me = '[' . __PACKAGE__ . ']';
 $DEBUG = 0;
 
-(%info) = (%FS::part_pkg::flat::info);
-$info{name} = 'Introductory price for X months, then flat rate,'.
-              'relative to setup date (anniversary billing)';
-$info{shortname} = 'Anniversary, with intro price';
-$info{fields} = { %{$info{fields}} };
-$info{fields}{intro_fee} =
-         { 'name' => 'Introductory recurring fee for this package',
+%info = (
+  'name' => 'Introductory price for X months, then flat rate,'.
+            'relative to setup date (anniversary billing)',
+  'shortname' => 'Anniversary, with intro price',
+  'inherit_fields' => [ 'flat', 'usage_Mixin', 'global_Mixin' ],
+  'fields' => {
+    'intro_fee' => { 'name' => 'Introductory recurring fee for this package',
                      'default' => 0,
-         };
-$info{fields}{intro_duration} =
+                   },
+    'intro_duration' =>
          { 'name' => 'Duration of the introductory period, in number of months',
            'default' => 0,
-         };
-$info{fieldorder} = [ @{ $info{fieldorder} } ];
-splice @{$info{fieldorder}}, 1, 0, qw( intro_duration intro_fee );
-$info{weight} = 14;
+         },
+  },
+  'fieldorder' => [ qw(intro_duration intro_fee) ],
+  'weight' => 14,
+);
 
 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) {
     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;
-
 }