fix 'Can't call method "setup" on an undefined value' error when using into rates...

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

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 719fb23..7233cc6 100644 (file)
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -1,7 +1,7 @@
 package FS::part_pkg::recur_Common;
+use base qw( FS::part_pkg::flat );
 
 use strict;
-use base qw( FS::part_pkg::flat );
 use vars qw( %info %recur_method );
 use Tie::IxHash;
 use Time::Local;
@@ -19,6 +19,24 @@ sub base_recur {
   $self->option('recur_fee', 1) || 0;
 }
 
+sub calc_setup {
+  # moved from all descendant packages which just had $self->option('setup_fee')
+  my($self, $cust_pkg, $sdate, $details, $param) = @_;
+
+  return 0 if $self->prorate_setup($cust_pkg, $sdate);
+
+  my $charge = $self->option('setup_fee');
+
+  my $discount = 0;
+  if ( $charge > 0 ) {
+      $param->{'setup_charge'} = $charge;
+      $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+      delete $param->{'setup_charge'};
+  }
+
+  sprintf('%.2f', $charge - $discount);
+}
+
 sub cutoff_day {
   # prorate/subscription only; we don't support sync_bill_date here
   my $self = shift;
@@ -42,7 +60,7 @@ sub calc_recur_Common {
     my $recur_method = $self->option('recur_method', 1) || 'anniversary';
     my $cutoff_day = $self->cutoff_day($cust_pkg);
 
-    $charges = $self->base_recur;
+    $charges = $self->base_recur($cust_pkg);
     $charges += $param->{'override_charges'} if $param->{'override_charges'};
 
     if ( $recur_method eq 'prorate' ) {