X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fsesmon_minute.pm;h=39516f8b3b83a72040150573d1105d2866da9056;hb=8f5c91d6c7a8dc85a8b6768a149b4c7b3e144c38;hp=9ef76d781d67ca5d681e6b3143c7fcfd212e8dd3;hpb=2041a9143fac20b79ead4a1ae01224dedf5b27c2;p=freeside.git

diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm
index 9ef76d781..39516f8b3 100644
--- a/FS/FS/part_pkg/sesmon_minute.pm
+++ b/FS/FS/part_pkg/sesmon_minute.pm
@@ -3,38 +3,38 @@ package FS::part_pkg::sesmon_minute;
 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);
+@ISA = qw(FS::part_pkg::flat);
 
 %info = (
-    'name' => 'Base charge plus charge per-minute from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_min' => { 'name' => 'Minutes included',
-                                'default' => 0,
-                                },
-      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
-                                'default' => 0,
+  'name' => 'Base charge plus charge per-minute from the session monitor',
+  'fields' => {
+    'setup_fee' => { 'name' => 'Setup fee for this package',
+                     'default' => 0,
+                   },
+    'recur_flat' => { 'name' => 'Base recurring fee for this package',
+                      'default' => 0,
+                    },
+    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
+                                   ' of service at cancellation',
+                         'type' => 'checkbox',
+                       },
+    'recur_included_min' => { 'name' => 'Minutes included',
+                              'default' => 0,
                               },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
-    #'setup' => 'what.setup_fee.value',
-    #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
-    'weight' => 80,
+    'recur_minly_charge' => { 'name' => 'Additional charge per minute',
+                              'default' => 0,
+                            },
+  },
+  'fieldorder' => [ 'setup_fee', 'recur_flat', 'unused_credit', 'recur_included_min', 'recur_minly_charge' ],
+  #'setup' => 'what.setup_fee.value',
+  #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
+  'weight' => 80,
 );
 
-sub calc_setup {
-  my( $self, $cust_pkg ) = @_;
-  $self->option('setup_fee');
-}
 
-sub cakc_recur {
+sub calc_recur {
   my( $self, $cust_pkg ) = @);
   my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60;
   $min -= $self->option('recur_included_min');
@@ -43,4 +43,13 @@ sub cakc_recur {
   $self->option('recur_flat') + $min * $self->option('recur_minly_charge');
 }
 
+sub is_free_options {
+  qw( setup_fee recur_fee recur_minly_charge );
+}
+
+sub base_recur {
+  my($self, $cust_pkg) = @_;
+  $self->option('recur_flat');
+}
+
 1;