X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fsesmon_hour.pm;h=22ece9557c3e7ca6f6af52847bcde08b0f00abcf;hb=63cc857641a92d0c79635ce907c36f15e308b986;hp=9843edbec3e2de6d7c6e4724a070034b6c819a95;hpb=96946b956b5f89693f94e2aab930510a036b8192;p=freeside.git

diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm
index 9843edbec..22ece9557 100644
--- a/FS/FS/part_pkg/sesmon_hour.pm
+++ b/FS/FS/part_pkg/sesmon_hour.pm
@@ -9,13 +9,14 @@ use FS::part_pkg::flat;
 
 %info = (
   'name' => 'Base charge plus charge per-hour from the session monitor',
+  'shortname' => 'Session monitor (per-hour)',
   'fields' => {
     'setup_fee' => { 'name' => 'Setup fee for this package',
                      'default' => 0,
                    },
-    'recur_flat' => { 'name' => 'Base recurring fee for this package',
-                      'default' => 0,
-                    },
+    'recur_fee' => { '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',
@@ -27,9 +28,9 @@ use FS::part_pkg::flat;
                                'default' => 0,
                              },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_flat', 'unused_credit', 'recur_included_hours', 'recur_hourly_charge' ],
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'recur_included_hours', 'recur_hourly_charge' ],
   #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  #'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_fee.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
   'weight' => 80,
 );
 
@@ -40,7 +41,7 @@ sub calc_recur {
   $hours -= $self->option('recur_included_hours');
   $hours = 0 if $hours < 0;
 
-  $self->option('recur_flat') + $hours * $self->option('recur_hourly_charge');
+  $self->option('recur_fee') + $hours * $self->option('recur_hourly_charge');
 
 }
 
@@ -50,7 +51,7 @@ sub is_free_options {
 
 sub base_recur {
   my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
+  $self->option('recur_fee');
 }
 
 1;