fix intro rates packages vs discounts, RT#83503

[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 95ae0d0..fc87628 100644 (file)
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -1,12 +1,10 @@
 package FS::part_pkg::recur_Common;
+use base qw( FS::part_pkg::flat );
 
 use strict;
-use vars qw( @ISA %info %recur_method );
+use vars qw( %info %recur_method );
 use Tie::IxHash;
 use Time::Local;
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
 
 %info = ( 'disabled' => 1 ); #recur_Common not a usable price plan directly
 
@@ -21,6 +19,43 @@ 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, $time, $details, $param) = @_;
+
+  return 0 if $self->prorate_setup($cust_pkg, $time);
+
+  my $charge = $self->option('setup_fee');
+
+  my $discount = 0;
+  if ( $charge > 0 ) {
+      $param->{'setup_charge'} = $charge;
+      $discount = $self->calc_discount($cust_pkg, \$time, $details, $param);
+      delete $param->{'setup_charge'};
+  }
+
+  sprintf('%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
+}
+
+sub cutoff_day {
+  # prorate/subscription only; we don't support sync_bill_date here
+  my( $self, $cust_pkg ) = @_;
+  my $recur_method = $self->option('recur_method',1) || 'anniversary';
+  my $cust_main = $cust_pkg->cust_main;
+
+  return ( $cust_main->prorate_day )
+    if $cust_main->prorate_day and (    $cust_main->force_prorate_day
+                                     || $recur_method eq 'prorate'
+                                     || $recur_method eq 'subscription'
+                                   );
+
+  return split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1')
+    if $recur_method eq 'prorate'
+    || $recur_method eq 'subscription';
+
+  return ();
+}
+
 sub calc_recur_Common {
   my $self = shift;
   my($cust_pkg, $sdate, $details, $param ) = @_; #only need $sdate & $param
@@ -30,35 +65,28 @@ sub calc_recur_Common {
   if ( $param->{'increment_next_bill'} ) {
 
     my $recur_method = $self->option('recur_method', 1) || 'anniversary';
-    
-    $charges = $self->base_recur;
+    my @cutoff_day = $self->cutoff_day($cust_pkg);
+
+    $charges = $self->base_recur($cust_pkg, $sdate, $details, $param);
     $charges += $param->{'override_charges'} if $param->{'override_charges'};
 
     if ( $recur_method eq 'prorate' ) {
-      my $cutoff_day = $self->option('cutoff_day') || 1;
-      $charges = $self->calc_prorate(@_, $cutoff_day);
-    }
-    elsif ( $recur_method eq 'anniversary' and 
-            $self->option('sync_bill_date',1) ) {
-      my $next_bill = $cust_pkg->cust_main->next_bill_date;
-      if ( defined($next_bill) ) {
-        my $cutoff_day = (localtime($next_bill))[3];
-        $charges = $self->calc_prorate(@_, $cutoff_day);
-      }
-    } 
-    elsif ( $recur_method eq 'subscription' ) {
 
-      my $cutoff_day = $self->option('cutoff_day', 1) || 1;
+      $charges = $self->calc_prorate(@_, @cutoff_day);
+      $charges += $param->{'override_charges'} if $param->{'override_charges'};
+
+    } elsif ( $recur_method eq 'subscription' ) {
+
       my ($day, $mon, $year) = ( localtime($$sdate) )[ 3..5 ];
 
-      if ( $day < $cutoff_day ) {
+      if ( $day < $cutoff_day[0] ) {
         if ( $mon == 0 ) { $mon=11; $year--; }
         else { $mon--; }
       }
 
-      $$sdate = timelocal(0, 0, 0, $cutoff_day, $mon, $year);
+      $$sdate = timelocal(0, 0, 0, $cutoff_day[0], $mon, $year);
 
-    }#$recur_method eq 'subscription'
+    }#$recur_method
 
     $charges -= $self->calc_discount( $cust_pkg, $sdate, $details, $param );