per-customer option to force anniversary packages to prorate, #38191

4 files changed, 23 insertions, 7 deletions

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 97d4363..504def0 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -173,6 +173,12 @@ sub calc_recur {
 sub cutoff_day {
   my $self = shift;
   my $cust_pkg = shift;
+  my $cust_main = $cust_pkg->cust_main;
+  # force it to act like a prorate package, is what this means
+  # because we made a distinction once between prorate and flat packages
+  if ( $cust_main->force_prorate_day  and $cust_main->prorate_day ) {
+     return ( $cust_main->prorate_day );
+  }
   if ( $self->option('sync_bill_date',1) ) {
     my $next_bill = $cust_pkg->cust_main->next_bill_date;
     if ( $next_bill ) {
diff --git a/FS/FS/part_pkg/prorate_calendar.pm b/FS/FS/part_pkg/prorate_calendar.pm
index c50cae0..a8ed8f9 100644
--- a/FS/FS/part_pkg/prorate_calendar.pm
+++ b/FS/FS/part_pkg/prorate_calendar.pm
@@ -72,7 +72,11 @@ sub check {
 sub cutoff_day {
   my( $self, $cust_pkg ) = @_;
   my @periods = @{ $freq_cutoff_days{$self->freq} };
-  my @cutoffs = ($self->option('cutoff_day') || 1); # Jan 1 = 1
+  my $prorate_day = $cust_pkg->cust_main->prorate_day
+                    || $self->option('cutoff_day')
+                    || 1;
+
+  my @cutoffs = ($prorate_day);
   pop @periods; # we don't care about the last one
   foreach (@periods) {
     push @cutoffs, $cutoffs[-1] + $_;
diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm
index b73c62c..4ed83a4 100644
--- a/FS/FS/part_pkg/recur_Common.pm
+++ b/FS/FS/part_pkg/recur_Common.pm
@@ -41,13 +41,14 @@ 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';
-  return () unless $recur_method eq 'prorate'
-                || $recur_method eq 'subscription';
+  my $cust_main = $cust_pkg->cust_main;
 
-  #false laziness w/prorate.pm::cutoff_day
-  my $prorate_day = $cust_pkg->cust_main->prorate_day;
-  $prorate_day ? ( $prorate_day )
-               : split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');
+  if ( $cust_main->force_prorate_day and $cust_main->prorate_day ) {
+     return ( $cust_main->prorate_day );
+  } elsif ($recur_method eq 'prorate' || $recur_method eq 'subscription') {
+
+    return split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');
+  }
 }
 
 sub calc_recur_Common {
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index 0dfe049..bf644d4 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -88,6 +88,11 @@ use FS::part_pkg::flat;
 sub calc_recur {
   my($self, $cust_pkg, $sdate, $details, $param ) = @_;
   my $cutoff_day = $self->option('cutoff_day', 1) || 1;
+  my $cust_main = $cust_pkg->cust_main;
+  if ( $cust_main->force_prorate_day  and $cust_main->prorate_day ) {
+     $cutoff_day = $cust_main->prorate_day;
+  }
+
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];