X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_introrate.pm;h=1447730e73d9d9c21897539a7ec2df1c3b652af9;hb=51fa32c6d1d22d4b78afd4bf12e307fbdacc6062;hp=c92ba978ac443c1624c3dc5bda2b54224300e7d0;hpb=d89e7ead2dae24c924c351fbf2e485e6358d2ffa;p=freeside.git

diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index c92ba978a..1447730e7 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -1,45 +1,38 @@
 package FS::part_pkg::flat_introrate;
 
 use strict;
-use vars qw(@ISA %info $DEBUG $DEBUG_PRE);
-#use FS::Record qw(qsearch qsearchs);
+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;
-$DEBUG_PRE = '[' . __PACKAGE__ . ']: ';
 
 %info = (
   'name' => 'Introductory price for X months, then flat rate,'.
             'relative to setup date (anniversary billing)',
-  'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
+  'shortname' => 'Anniversary, with intro price',
+  'inherit_fields' => [ 'flat', 'usage_Mixin', 'global_Mixin' ],
+  'fields' => {
+    'intro_fee' => { 'name' => 'Introductory recurring fee for this package',
                      'default' => 0,
                    },
-    'intro_fee' => { 'name' => 'Introductory recurring free for this package',
-                     'default' => 0,
-                   },
-    'intro_duration' => { 'name' => 'Duration of the introductory period, ' .
-                                    'in number of months',
-                          'default' => 0,
-			},
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                    },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
+    'intro_duration' =>
+         { 'name' => 'Duration of the introductory period, in number of months',
+           'default' => 0,
+         },
   },
-  'fieldorder' => [ 'setup_fee', 'intro_duration', 'intro_fee', 'recur_fee', 'unused_credit' ],
-  'weight' => 150,
+  'fieldorder' => [ qw(intro_duration intro_fee) ],
+  'weight' => 14,
 );
 
-sub calc_recur {
+sub base_recur {
   my($self, $cust_pkg, $time ) = @_;
 
+  my $now = $time ? $$time : time;
+
   my ($duration) = ($self->option('intro_duration') =~ /^(\d+)$/);
   unless ($duration) {
     die "Invalid intro_duration: " . $self->option('intro_duration');
@@ -49,11 +42,11 @@ sub calc_recur {
   my $intro_end = &DateCalc($setup, "+${duration} month");
   my $recur;
 
-  warn $DEBUG_PRE . "\$duration = ${duration}" if $DEBUG;
-  warn $DEBUG_PRE . "\$intro_end = ${intro_end}" if $DEBUG;
-  warn $DEBUG_PRE . "$$time < " . &UnixDate($intro_end, '%s') if $DEBUG;
+  warn "$me: \$duration = ${duration}" if $DEBUG;
+  warn "$me: \$intro_end = ${intro_end}" if $DEBUG;
+  warn "$me: $now < " . &UnixDate($intro_end, '%s') if $DEBUG;
 
-  if ($$time < &UnixDate($intro_end, '%s')) {
+  if ($now < &UnixDate($intro_end, '%s')) {
     $recur = $self->option('intro_fee');
   } else {
     $recur = $self->option('recur_fee');