4 files changed, 33 insertions, 38 deletions

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 48a6ba940..298fe1796 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1209,7 +1209,8 @@ sub renew_info {
   my $total = $cust_main->balance;
 
   my @array = map {
-                    $total += $_->part_pkg->base_recur;
+                    my $bill = $_->bill;
+                    $total += $_->part_pkg->base_recur($_, \$bill);
                     my $renew_date = $_->part_pkg->add_freq($_->bill);
                     {
                       'pkgnum'             => $_->pkgnum,
diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 171885770..d1863f432 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -144,7 +144,8 @@ sub unit_setup {
 }
 
 sub calc_recur {
-  my($self, $cust_pkg) = @_;
+  my $self = shift;
+  my($cust_pkg) = @_;
 
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
@@ -152,7 +153,7 @@ sub calc_recur {
   return 0
     if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
 
-  $self->base_recur($cust_pkg);
+  $self->base_recur(@_);
 }
 
 sub base_recur {
diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index 2568afa11..2d551f10f 100644
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -1,46 +1,38 @@
 package FS::part_pkg::flat_introrate;
 
 use strict;
-use vars qw(@ISA %info $DEBUG $DEBUG_PRE);
+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;
-$DEBUG_PRE = '[' . __PACKAGE__ . ']: ';
 
-%info = (
-  'name' => 'Introductory price for X months, then flat rate,'.
-            'relative to setup date (anniversary billing)',
-  'shortname' => 'Anniversary, with intro price',
-  'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
+(%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',
                      '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',
-                       },
-  },
-  'fieldorder' => [ 'setup_fee', 'intro_duration', 'intro_fee', 'recur_fee', 'unused_credit' ],
-  'weight' => 14,
-);
-
-sub calc_recur {
+         };
+$info{fields}{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;
+
+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');
@@ -50,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');
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 13d0c7af8..4e35b91dd 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -39,8 +39,9 @@
                                    shift->part_pkg->option('setup_fee'),
                                  );
                         },
-                    sub { sprintf( $money_char.'%.2f',
-                                   shift->part_pkg->base_recur
+                    sub { my $c = shift;
+                          sprintf( $money_char.'%.2f',
+                                   $c->part_pkg->base_recur($c)
                                  );
                         },
                     sub { #shift->part_pkg->freq_pretty;