X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_delayed.pm;h=b4be72bec0f1f4b3b002f56d40a7fc39014ba1ed;hp=8ac1682802cb74b7aa252b04650fbe13400d97d0;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=5e05724a635a22776f1b973f5d7e77989da4e048

diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
index 8ac168280..b4be72bec 100644
--- a/FS/FS/part_pkg/flat_delayed.pm
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -10,32 +10,23 @@ use FS::part_pkg::flat;
 %info = (
   'name' => 'Free (or setup fee) for X days, then flat rate'.
             ' (anniversary billing)',
+  'shortname' => 'Anniversary, 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)',
+                                  ' 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', 'recur_notify',
-                    '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' => 12,
 );
 
 sub calc_setup {
@@ -57,11 +48,6 @@ sub calc_remain {
   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);
 }