X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_delayed.pm;h=dd1b81600f662a9e8dc5097166d5a97012a52f1e;hb=9a42cc876677b9be8e55dce93d66f92e81d1416b;hp=ee664327ee9b1d25c1ff184d31a1489ab7f56fca;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm
index ee664327e..dd1b81600 100644
--- a/FS/FS/part_pkg/prorate_delayed.pm
+++ b/FS/FS/part_pkg/prorate_delayed.pm
@@ -10,25 +10,22 @@ 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', #??
+  'inherit_fields' => [ 'global_Mixin' ],
   'fields' =>  {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
     'free_days' => { 'name' => 'Initial free days',
-                     'default' => 0,
-                   },
-    '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',
-                       },
   },
-  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
+  'fieldorder' => [ 'free_days', 'recur_notify' ],
   #'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 {
@@ -43,18 +40,13 @@ sub calc_setup {
 
 sub calc_remain {
   my ($self, $cust_pkg, %options) = @_;
-  my $next_bill = $cust_pkg->getfield('bill') || 0;
   my $last_bill = $cust_pkg->last_bill || 0;
+  my $next_bill = $cust_pkg->getfield('bill') || 0;
   my $free_days = $self->option('free_days');
 
   return 0 if    $last_bill + (86400 * $free_days) == $next_bill
               && $last_bill == $cust_pkg->setup;
 
-  return 0 if    ! $self->base_recur
-              || ! $self->option('unused_credit', 1)
-              || ! $last_bill
-              || ! $next_bill;
-
   return $self->SUPER::calc_remain($cust_pkg, %options);
 }