X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_sqlradacct.pm;h=441df587b3a92399746064ea8c7a2635899adc45;hb=cc04f43d238a1aed658d766577e45d96fcb38d77;hp=fd9c1ddb50e1f231f0b9059215846f4279309b72;hpb=96946b956b5f89693f94e2aab930510a036b8192;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index fd9c1ddb5..441df587b 100644
--- a/FS/FS/part_pkg/voip_sqlradacct.pm
+++ b/FS/FS/part_pkg/voip_sqlradacct.pm
@@ -13,14 +13,16 @@ use FS::rate_prefix;
 $DEBUG = 1;
 
 %info = (
+  'disabled' => 1, #they're sucked into our CDR table now instead
   'name' => 'VoIP rating by plan of CDR records in an SQL RADIUS radacct table',
+  'shortname' => 'VoIP/telco CDR rating (external RADIUS)',
   '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',
@@ -32,7 +34,7 @@ $DEBUG = 1;
                      'select_label' => 'ratename',
                    },
   },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum ignore_unrateable )],
+  'fieldorder' => [qw( setup_fee recur_fee unused_credit ratenum ignore_unrateable )],
   'weight' => 40,
 );
 
@@ -41,6 +43,7 @@ sub calc_setup {
   $self->option('setup_fee');
 }
 
+#false laziness w/voip_cdr... resolve it if this one ever gets used again
 sub calc_recur {
   my($self, $cust_pkg, $sdate, $details ) = @_;
 
@@ -174,17 +177,17 @@ sub calc_recur {
 
   } # $cust_svc
 
-  $self->option('recur_flat') + $charges;
+  $self->option('recur_fee') + $charges;
 
 }
 
-sub is_free {
-  0;
-}
+sub can_discount { 0; }
+
+sub is_free { 0; }
 
 sub base_recur {
   my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
+  $self->option('recur_fee');
 }
 
 1;