X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_Mixin.pm;h=6d0c2dad4b20d1508e6e8b5b2c9669f68e0e32f6;hb=49ea5f3f188b474557417dd58bb59b7334c5837b;hp=1aa2f2c0c78c230b412e0a979c0ecc30e7dd734a;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm
index 1aa2f2c0c..6d0c2dad4 100644
--- a/FS/FS/part_pkg/prorate_Mixin.pm
+++ b/FS/FS/part_pkg/prorate_Mixin.pm
@@ -23,14 +23,14 @@ sub calc_recur {
   ...
   if( conditions that trigger prorate ) {
     # sets $$sdate and $param->{'months'}, returns the prorated charge
-    $charges = $self->calc_prorate($cust_pkg, $sdate, $param);
+    $charges = $self->calc_prorate($cust_pkg, $sdate, $param, $cutoff_day);
   } 
   ...
 }
 
 =head METHODS
 
-=item calc_prorate CUST_PKG SDATE DETAILS PARAM
+=item calc_prorate CUST_PKG SDATE DETAILS PARAM CUTOFF_DAY
 
 Takes all the arguments of calc_recur.  Calculates a prorated charge from 
 the $sdate to the cutoff day for this package definition, and sets the $sdate 
@@ -48,21 +48,21 @@ day arrives.
 =cut
 
 sub calc_prorate {
-  my $self  = shift;
-  my ($cust_pkg, $sdate, $details, $param) = @_;
-  my $cutoff_day = $self->cutoff_day($cust_pkg) or return; #die?
+  my ($self, $cust_pkg, $sdate, $details, $param, $cutoff_day) = @_;
+  die "no cutoff_day" unless $cutoff_day;
+  die "can't prorate non-monthly package\n" if $self->freq =~ /\D/;
 
   my $charge = $self->base_recur($cust_pkg, $sdate) || 0;
-  if ( $cutoff_day ) {
+
     my $mnow = $$sdate;
 
     # if this is the first bill but the bill date has been set
     # (by prorate_defer_bill), calculate from the setup date,
     # and append the setup fee to @$details.
-    if ( $self->option('prorate_defer_bill')
+    if ( $self->option('prorate_defer_bill',1)
         and ! $cust_pkg->getfield('last_bill') 
         and $cust_pkg->setup ) {
-      warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
+      #warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
       $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
       $mnow = $cust_pkg->setup;
     }
@@ -86,7 +86,7 @@ sub calc_prorate {
 
     $param->{'months'} = $months;
     $charge = sprintf('%.2f', $permonth * $months);
-  }
+
   return $charge;
 }