X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_delayed.pm;h=f0a4f94c9ef91fd4e32a4ad39cdb860f9ee33ac2;hb=0534412bf84b022fe23f9231cb66424b7f6033df;hp=8ea64a8e1cce5e2832a96b9300aa97b80f3d5e6f;hpb=1dfbdf3fc791665e7476277758fd3093ba82cdff;p=freeside.git diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm index 8ea64a8e1..f0a4f94c9 100644 --- a/FS/FS/part_pkg/prorate_delayed.pm +++ b/FS/FS/part_pkg/prorate_delayed.pm @@ -1,56 +1,22 @@ package FS::part_pkg::prorate_delayed; +use base qw( FS::part_pkg::delayed_Mixin FS::part_pkg::prorate ); use strict; -use vars qw(@ISA %info); -#use FS::Record qw(qsearch qsearchs); -use FS::part_pkg; - -@ISA = qw(FS::part_pkg::prorate); +use vars qw(%info); %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' ], + 'inherit_fields' => [qw( global_Mixin delayed_Mixin )], 'fields' => { - 'free_days' => { 'name' => 'Initial free days', - 'default' => 0, - }, - 'recur_notify' => { 'name' => 'Number of days before recurring billing'. - ' commences to notify customer. (0 means'. - ' no warning)', - 'default' => 0, - }, + #shouldn't this be inherited from somewhere? 'suspend_bill' => { 'name' => 'Continue recurring billing while suspended', 'type' => 'checkbox', }, }, - 'fieldorder' => [ 'free_days', 'recur_notify', 'suspend_bill', ], - #'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', + 'fieldorder' => [ 'suspend_bill', ], 'weight' => 22, ); -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'); -} - -sub calc_remain { - my ($self, $cust_pkg, %options) = @_; - 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 $self->SUPER::calc_remain($cust_pkg, %options); -} - 1;