X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_delayed.pm;h=f50557db092a3c98c76c18c6b93398117e50f77f;hb=57bb423fe457ba4e13726877f53bcdf944f828f8;hp=ec11699d9645d8d16c50840c71d79c697e460a86;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
index ec11699d9..f50557db0 100644
--- a/FS/FS/part_pkg/flat_delayed.pm
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -1,44 +1,22 @@
 package FS::part_pkg::flat_delayed;
+use base qw(FS::part_pkg::delayed_Mixin FS::part_pkg::flat );
 
 use strict;
-use vars qw(@ISA %info);
-#use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
+use vars qw(%info);
 
 %info = (
   'name' => 'Free (or setup fee) for X days, then flat rate'.
             ' (anniversary billing)',
+  'shortname' => 'Anniversary, with intro period',
+  'inherit_fields' => [qw( global_Mixin delayed_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,
-                    },
-    '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' ],
-  #'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,
+    #shouldn't this be inherited from somewhere?
+    'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
+                        'type' => 'checkbox',
+                      },
+      },
+  'fieldorder' => [ 'suspend_bill', ],
+  'weight' => 12,
 );
 
-sub calc_setup {
-  my($self, $cust_pkg, $time ) = @_;
-
-  my $d = $cust_pkg->bill || $time;
-  $d += 86400 * $self->option('free_days');
-  $cust_pkg->bill($d);
-  
-  $self->option('setup_fee');
-}
-
 1;