X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fprorate_delayed.pm;h=0073493edeb865b516a0e96435dcb36caebc35f6;hb=7c47d95403d8ff9a93848a6ad9de9dcedca84bde;hp=bd2aec582b10e40d4636b0f1fa374a049fb943e1;hpb=e3dffa23a03cd9f88946ceb78bc75ada29bc013a;p=freeside.git diff --git a/FS/FS/part_pkg/prorate_delayed.pm b/FS/FS/part_pkg/prorate_delayed.pm index bd2aec582..0073493ed 100644 --- a/FS/FS/part_pkg/prorate_delayed.pm +++ b/FS/FS/part_pkg/prorate_delayed.pm @@ -21,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', @@ -51,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;