X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_Mixin.pm;h=1aa2f2c0c78c230b412e0a979c0ecc30e7dd734a;hb=f9a181e4c2e505df84de16190ee3b75011326f3f;hp=9c0c2669b284ba684b59e31e72e004ca3720766d;hpb=cc04f43d238a1aed658d766577e45d96fcb38d77;p=freeside.git

diff --git a/FS/FS/part_pkg/prorate_Mixin.pm b/FS/FS/part_pkg/prorate_Mixin.pm
index 9c0c2669b..1aa2f2c0c 100644
--- a/FS/FS/part_pkg/prorate_Mixin.pm
+++ b/FS/FS/part_pkg/prorate_Mixin.pm
@@ -23,64 +23,63 @@ 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, $cutoff_day);
+    $charges = $self->calc_prorate($cust_pkg, $sdate, $param);
   } 
   ...
 }
 
 =head METHODS
 
-=item calc_prorate CUST_PKG
+=item calc_prorate CUST_PKG SDATE DETAILS PARAM
 
-Takes all the arguments of calc_recur, followed by a day of the month 
-to prorate to.  Calculates a prorated charge from the $sdate to that day, 
-and sets the $sdate and $param->{months} accordingly.
+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 
+and $param->{months} accordingly.  base_recur() will be called to determine 
+the base price per billing cycle.
 
 Options:
-- recur_fee: The charge to use for a complete billing period.
 - add_full_period: Bill for the time up to the prorate day plus one full
 billing period after that.
 - prorate_round_day: Round the current time to the nearest full day, 
 instead of using the exact time.
+- prorate_defer_bill: Don't bill the prorate interval until the prorate 
+day arrives.
 
 =cut
 
 sub calc_prorate {
   my $self  = shift;
-  my ($cust_pkg, $sdate, $details, $param, $cutoff_day) = @_;
- 
-  my $charge = $self->option('recur_fee',1) || 0;
-  if($cutoff_day) {
-    # only works for freq >= 1 month; probably can't be fixed
+  my ($cust_pkg, $sdate, $details, $param) = @_;
+  my $cutoff_day = $self->cutoff_day($cust_pkg) or return; #die?
+
+  my $charge = $self->base_recur($cust_pkg, $sdate) || 0;
+  if ( $cutoff_day ) {
     my $mnow = $$sdate;
-    my ($sec, $min, $hour, $mday, $mon, $year) = (localtime($mnow))[0..5];
-    if( $self->option('prorate_round_day',1) ) {
-      $mday++ if $hour >= 12;
-      $mnow = timelocal(0,0,0,$mday,$mon,$year);
-    }
-    my $mend;
-    my $mstart;
-    if ( $mday >= $cutoff_day ) {
-      $mend = 
-        timelocal(0,0,0,$cutoff_day,$mon == 11 ? 0 : $mon + 1,$year+($mon==11));
-      $mstart =
-        timelocal(0,0,0,$cutoff_day,$mon,$year);
-    }
-    else {
-      $mend = 
-        timelocal(0,0,0,$cutoff_day,$mon,$year);
-      $mstart = 
-        timelocal(0,0,0,$cutoff_day,$mon == 0 ? 11 : $mon - 1,$year-($mon==11));
+
+    # 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')
+        and ! $cust_pkg->getfield('last_bill') 
+        and $cust_pkg->setup ) {
+      warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
+      $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
+      $mnow = $cust_pkg->setup;
     }
-   
+
+    my ($mend, $mstart);
+    ($mnow, $mend, $mstart) = $self->_endpoints($mnow, $cutoff_day);
+
     # next bill date will be figured as $$sdate + one period
     $$sdate = $mstart;
 
     my $permonth = $charge / $self->freq;
     my $months = ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
 
-    if ( $self->option('add_full_period',1) ) {
-      # charge a full period in addition to the partial month
+    # add a full period if currently billing for a partial period
+    if ( ( $self->option('add_full_period',1) 
+        or $self->option('prorate_defer_bill',1) ) # necessary
+        and $months < $self->freq ) {
       $months += $self->freq;
       $$sdate = $self->add_freq($mstart);
     }
@@ -91,4 +90,79 @@ sub calc_prorate {
   return $charge;
 }
 
+=item prorate_setup CUST_PKG SDATE
+
+Set up the package.  This only has an effect if prorate_defer_bill is 
+set, in which case it postpones the next bill to the cutoff day.
+
+=cut
+
+sub prorate_setup {
+  my $self = shift;
+  my ($cust_pkg, $sdate) = @_;
+  my $cutoff_day = $self->cutoff_day($cust_pkg);
+  if ( ! $cust_pkg->bill
+      and $self->option('prorate_defer_bill',1)
+      and $cutoff_day
+  ) {
+    my ($mnow, $mend, $mstart) = $self->_endpoints($sdate, $cutoff_day);
+    # if today is the cutoff day, set the next bill to right now instead 
+    # of waiting a month.
+    if ( $mnow - $mstart < 86400 ) {
+      $cust_pkg->bill($mnow);
+    }
+    else {
+      $cust_pkg->bill($mend);
+    }
+    return 1;
+  }
+  return 0;
+}
+
+=item _endpoints TIME CUTOFF_DAY
+
+Given a current time and a day of the month to prorate to, return three 
+times: the start of the prorate interval (usually the current time), the
+end of the prorate interval (i.e. the cutoff date), and the time one month 
+before the end of the prorate interval.
+
+=cut
+
+sub _endpoints {
+  my ($self, $mnow, $cutoff_day) = @_;
+
+  # only works for freq >= 1 month; probably can't be fixed
+  my ($sec, $min, $hour, $mday, $mon, $year) = (localtime($mnow))[0..5];
+  if( $self->option('prorate_round_day',1) ) {
+    $mday++ if $hour >= 12;
+    $mnow = timelocal(0,0,0,$mday,$mon,$year);
+  }
+  my $mend;
+  my $mstart;
+  # if cutoff day > 28, force it to the 1st of next month
+  if ( $cutoff_day > 28 ) {
+    $cutoff_day = 1;
+    # and if we are currently after the 28th, roll the current day 
+    # forward to that day
+    if ( $mday > 28 ) {
+      $mday = 1;
+      #set $mnow = $mend so the amount billed will be zero
+      $mnow = timelocal(0,0,0,1,$mon == 11 ? 0 : $mon + 1,$year+($mon==11));
+    }
+  }
+  if ( $mday >= $cutoff_day ) {
+    $mend = 
+      timelocal(0,0,0,$cutoff_day,$mon == 11 ? 0 : $mon + 1,$year+($mon==11));
+    $mstart =
+      timelocal(0,0,0,$cutoff_day,$mon,$year);
+  }
+  else {
+    $mend = 
+      timelocal(0,0,0,$cutoff_day,$mon,$year);
+    $mstart = 
+      timelocal(0,0,0,$cutoff_day,$mon == 0 ? 11 : $mon - 1,$year-($mon==0));
+  }
+  return ($mnow, $mend, $mstart);
+}
+
 1;