import torrus 1.0.9

[freeside.git] / FS / FS / part_pkg / sesmon_minute.pm

diff --git a/FS/FS/part_pkg/sesmon_minute.pm b/FS/FS/part_pkg/sesmon_minute.pm
index f941e00..9c8dfd1 100644 (file)
--- a/FS/FS/part_pkg/sesmon_minute.pm
+++ b/FS/FS/part_pkg/sesmon_minute.pm
@@ -10,17 +10,8 @@ use FS::part_pkg::flat;
 %info = (
   'name' => 'Base charge plus charge per-minute from the session monitor',
   'shortname' => 'Session monitor (per-minute)',
+  'inherit_fields' => [ 'global_Mixin' ],
   '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,
                               },
@@ -28,9 +19,9 @@ use FS::part_pkg::flat;
                               'default' => 0,
                             },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_flat', 'unused_credit', 'recur_included_min', 'recur_minly_charge' ],
+  'fieldorder' => [ '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;\'',
+  #'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_fee.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
   'weight' => 80,
 );
 
@@ -41,16 +32,18 @@ sub calc_recur {
   $min -= $self->option('recur_included_min');
   $min = 0 if $min < 0;
 
-  $self->option('recur_flat') + $min * $self->option('recur_minly_charge');
+  $self->option('recur_fee') + $min * $self->option('recur_minly_charge');
 }
 
+sub can_discount { 0; }
+
 sub is_free_options {
   qw( setup_fee recur_fee recur_minly_charge );
 }
 
 sub base_recur {
   my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
+  $self->option('recur_fee');
 }
 
 1;