Merge branch 'patch-18' of https://github.com/gjones2/Freeside

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

diff --git a/FS/FS/part_pkg/delayed_Mixin.pm b/FS/FS/part_pkg/delayed_Mixin.pm
index d28480d..ab53bda 100644 (file)
--- a/FS/FS/part_pkg/delayed_Mixin.pm
+++ b/FS/FS/part_pkg/delayed_Mixin.pm
@@ -2,6 +2,7 @@ package FS::part_pkg::delayed_Mixin;
 
 use strict;
 use vars qw(%info);
+use NEXT;
 
 %info = (
   'disabled' => 1,
@@ -22,7 +23,8 @@ use vars qw(%info);
 );
 
 sub calc_setup {
-  my($self, $cust_pkg, $time ) = @_;
+  my $self = shift;
+  my( $cust_pkg, $time ) = @_;
 
   unless ( $self->option('delay_setup', 1) ) {
     my $d = $cust_pkg->bill || $time;
@@ -30,7 +32,7 @@ sub calc_setup {
     $cust_pkg->bill($d);
   }
   
-  $self->option('setup_fee');
+  $self->NEXT::calc_setup(@_);
 }
 
 sub calc_remain {
@@ -45,7 +47,7 @@ sub calc_remain {
                 && $last_bill == $cust_pkg->setup;
   }
 
-  return $self->SUPER::calc_remain($cust_pkg, %options);
+  return $self->NEXT::calc_remain($cust_pkg, %options);
 }
 
 sub can_start_date { ! shift->option('delay_setup', 1) }