clarify interface difference between calc_setup and calc_recur: calc_setup takes...

[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 e43a525..4c9abeb 100644 (file)
--- a/FS/FS/part_pkg/flat_introrate.pm
+++ b/FS/FS/part_pkg/flat_introrate.pm
@@ -73,15 +73,15 @@ sub intro_end {
 }
 
 sub base_recur {
-  my($self, $cust_pkg, $time ) = @_;
+  my($self, $cust_pkg, $sdate ) = @_;
 
   my $now;
-  if (!$time) { # the "$sdate" from _make_lines
+  if (!$sdate) { # the "$sdate" from _make_lines
     my $log = FS::Log->new('FS::part_pkg');
     $log->warning("flat_introrate base_recur requires date!");
     $now = time;
   } else {
-    $now = $$time;
+    $now = $$sdate;
   }
 
   if ($now < $self->intro_end($cust_pkg)) {
@@ -94,7 +94,7 @@ sub base_recur {
 
 sub item_discount {
   my ($self, $cust_pkg) = @_;
-  return unless $self->option('show_as_discount');
+  return unless $self->option('show_as_discount',1);
   my $intro_end = $self->intro_end($cust_pkg);
   my $amount = sprintf('%.2f',
                 $self->option('intro_fee') - $self->option('recur_fee')