X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_sqlradacct.pm;h=b4f0cf9b576c5a90c3a4763b777b2fa1f4ce37bc;hb=92adead1404db357a11b58f38c2b4403381a2809;hp=a2f998a17fd702bb4b9db6fcd2318ddc098d9177;hpb=4045b74f9dbb7d195772e404966b20a18262b07e;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index a2f998a17..b4f0cf9b5 100644
--- a/FS/FS/part_pkg/voip_sqlradacct.pm
+++ b/FS/FS/part_pkg/voip_sqlradacct.pm
@@ -4,7 +4,7 @@ use strict;
 use vars qw(@ISA $DEBUG %info);
 use Date::Format;
 use FS::Record qw(qsearchs qsearch);
-use FS::part_pkg;
+use FS::part_pkg::flat;
 #use FS::rate;
 use FS::rate_prefix;
 
@@ -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 monthly charge 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 ) = @_;
 
@@ -153,14 +156,15 @@ sub calc_recur {
       }
 
       my $rate_region = $rate_prefix->rate_region;
-      warn "  (rate region $rate_region)" if $DEBUG;
+      warn "  (rate region $rate_region)\n" if $DEBUG;
 
       my @call_details = (
-        time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
-        "+$countrycode $dest",
-        $rate_region->regionname,
+        #time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
+        time2str("%c", $session->{'acctstarttime'}),
         $minutes.'m',
         '$'.$charge,
+        "+$countrycode $dest",
+        $rate_region->regionname,
       );
 
       warn "  adding details on charge to invoice: ".
@@ -173,7 +177,7 @@ sub calc_recur {
 
   } # $cust_svc
 
-  $self->option('recur_flat') + $charges;
+  $self->option('recur_fee') + $charges;
 
 }
 
@@ -183,7 +187,7 @@ sub is_free {
 
 sub base_recur {
   my($self, $cust_pkg) = @_;
-  $self->option('recur_flat');
+  $self->option('recur_fee');
 }
 
 1;