diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-08-30 17:06:44 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-08-30 17:06:44 -0700 |
| commit | cfe0406764d057feeea74b676acc08917fa23f26 (patch) | |
| tree | 4ebe05a744f391579c122d1c3643a1bcfeb48d3c | |
| parent | 0ba5bbd31a7bd3bc99c6173d28ea9de7103c1b84 (diff) | |
fix prorate_day without force_prorate_day for recur_Common packages configured as subscription or prorate, RT#77140, RT#38191
| -rw-r--r-- | FS/FS/part_pkg/recur_Common.pm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/FS/FS/part_pkg/recur_Common.pm b/FS/FS/part_pkg/recur_Common.pm index 4ed83a46b..729fb6125 100644 --- a/FS/FS/part_pkg/recur_Common.pm +++ b/FS/FS/part_pkg/recur_Common.pm @@ -43,12 +43,17 @@ sub cutoff_day { my $recur_method = $self->option('recur_method',1) || 'anniversary'; my $cust_main = $cust_pkg->cust_main; - 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 ( $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'); - } + return split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1') + if $recur_method eq 'prorate' + || $recur_method eq 'subscription'; + + return (); } sub calc_recur_Common { |