X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Frecur_Common.pm;h=fc87628ea99ad179eaf9b00a4143ca6960a09f0f;hp=48e9307c41fbb3de23b6d585c6a9218015f31a64;hb=74f4610304eb373363ac07fc6e655d16c5f0ed33;hpb=90dfd05877a331fb13ba50389e3d8a3105465bc7

diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index 48e9307c4..fc87628ea 100644
--- 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;
@@ -21,21 +21,39 @@ sub base_recur {
 
 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);
-  $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 = shift;
-  my $cust_pkg = shift;
+  my( $self, $cust_pkg ) = @_;
   my $recur_method = $self->option('recur_method',1) || 'anniversary';
-  if ( $recur_method eq 'prorate' or $recur_method eq 'subscription' ) {
-    return $self->option('cutoff_day',1) || 1;
-  } else {
-    return 0;
-  }
+  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 {
@@ -47,26 +65,26 @@ sub calc_recur_Common {
   if ( $param->{'increment_next_bill'} ) {
 
     my $recur_method = $self->option('recur_method', 1) || 'anniversary';
-    my $cutoff_day = $self->cutoff_day($cust_pkg);
+    my @cutoff_day = $self->cutoff_day($cust_pkg);
 
-    $charges = $self->base_recur;
+    $charges = $self->base_recur($cust_pkg, $sdate, $details, $param);
     $charges += $param->{'override_charges'} if $param->{'override_charges'};
 
     if ( $recur_method eq 'prorate' ) {
 
-      $charges = $self->calc_prorate(@_, $cutoff_day);
+      $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