fix cancellation errors with updated flat_introrate, RT#5865

[freeside.git] / FS / FS / part_pkg / prorate_delayed.pm

diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm
index ee66432..0073493 100644 (file)
--- a/FS/FS/part_pkg/prorate_delayed.pm
+++ b/FS/FS/part_pkg/prorate_delayed.pm
@@ -10,6 +10,7 @@ use FS::part_pkg;
 %info = (
   'name' => 'Free (or setup fee) for X days, then prorate, then flat-rate ' .
          '(1st of month billing)',
+  'shortname' => 'Prorate (Nth of month billing), with intro period', #??
   'fields' =>  {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
@@ -20,6 +21,11 @@ use FS::part_pkg;
     'recur_fee' => { 'name' => 'Recurring fee for this package',
                      'default' => 0,
                     },
+    'recur_notify' => { 'name' => 'Number of days before recurring billing'.
+                                  ' commences to notify customer. (0 means'.
+                                  ' no warning)',
+                     'default' => 0,
+                    },
     'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
                                    ' of service at cancellation',
                          'type' => 'checkbox',
@@ -28,7 +34,7 @@ use FS::part_pkg;
   'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
   #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
   #'recur' => 'what.recur_fee.value',
-  'weight' => 50,
+  'weight' => 22,
 );
 
 sub calc_setup {
@@ -50,7 +56,7 @@ sub calc_remain {
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
+  return 0 if    ! $self->base_recur($cust_pkg)
               || ! $self->option('unused_credit', 1)
               || ! $last_bill
               || ! $next_bill;