X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fsesmon_hour.pm;h=8d019c306c3710e320fa1940c1ad483c8a3830de;hb=3c54c844c665ed108c7892a154fd3972fab1f3e5;hp=8f6da197e436e3b65d8c6ba7d5182e567a811789;hpb=b8cfd0780aa40bb07f3215bf9cb58011f5e32a35;p=freeside.git

diff --git a/FS/FS/part_pkg/sesmon_hour.pm b/FS/FS/part_pkg/sesmon_hour.pm
index 8f6da197e..8d019c306 100644
--- a/FS/FS/part_pkg/sesmon_hour.pm
+++ b/FS/FS/part_pkg/sesmon_hour.pm
@@ -3,35 +3,34 @@ package FS::part_pkg::sesmon_hour;
 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-hour 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_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', '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;\'',
-    'weight' => 80,
+  'disabled' => 1, #internal session db deprecated (or at least on hold)
+  'name' => 'Base charge plus charge per-hour from the session monitor',
+  'shortname' => 'Session monitor (per-hour)',
+  'inherit_fields' => [ 'global_Mixin' ],
+  'fields' => {
+    'recur_included_hours' => { 'name' => 'Hours included',
+                                'default' => 0,
+                              },
+    'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
+                               'default' => 0,
+                             },
+  },
+  'fieldorder' => [ '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_fee.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
+  'weight' => 80,
 );
 
-sub calc_setup {
-  my($self, $cust_pkg ) = @_;
-  $self->option('setup_fee');
+sub price_info {
+    my $self = shift;
+    my $str = $self->SUPER::price_info;
+    $str .= " plus usage" if $str;
+    $str;
 }
 
 sub calc_recur {
@@ -41,8 +40,19 @@ 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');
+
+}
+
+sub can_discount { 0; }
+
+sub is_free_options {
+  qw( setup_fee recur_fee recur_hourly_charge );
+}
 
+sub base_recur {
+  my($self, $cust_pkg) = @_;
+  $self->option('recur_fee');
 }
 
 1;