X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_delayed.pm;h=8ac1682802cb74b7aa252b04650fbe13400d97d0;hp=4a04583d69689588ecbb32ec0041dd5b3dff0bc2;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hpb=e4ae5122522f2d45c68a38eaef337a82029f2fc1

diff --git a/FS/FS/part_pkg/flat_delayed.pm b/FS/FS/part_pkg/flat_delayed.pm
index 4a04583d6..8ac168280 100644
--- a/FS/FS/part_pkg/flat_delayed.pm
+++ b/FS/FS/part_pkg/flat_delayed.pm
@@ -3,7 +3,7 @@ package FS::part_pkg::flat_delayed;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg;
+use FS::part_pkg::flat;
 
 @ISA = qw(FS::part_pkg::flat);
 
@@ -20,12 +20,19 @@ 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',
                        },
   },
-  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
+  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'recur_notify',
+                    '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,
@@ -41,4 +48,21 @@ sub calc_setup {
   $self->option('setup_fee');
 }
 
+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 $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);
+}
+
 1;