X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_sqlradacct.pm;h=b856b5cdafbb808c3af58bc2315e525cef3dd5d6;hb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;hp=79e82a15fe1b3b2792a62d455c2abc2e0aeccda7;hpb=583902ab51f62551fe3620d98d42e72620edfa76;p=freeside.git

diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index 79e82a15f..b856b5cda 100644
--- a/FS/FS/part_pkg/voip_sqlradacct.pm
+++ b/FS/FS/part_pkg/voip_sqlradacct.pm
@@ -2,8 +2,9 @@ package FS::part_pkg::voip_sqlradacct;
 
 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;
 
@@ -12,18 +13,11 @@ 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)',
+  'inherit_fields' => [ 'global_Mixin' ],
   'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_flat'     => { 'name' => 'Base monthly charge for this package',
-                          'default' => 0,
-                        },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
     'ratenum'   => { 'name' => 'Rate plan',
                      'type' => 'select',
                      'select_table' => 'rate',
@@ -31,15 +25,23 @@ $DEBUG = 1;
                      'select_label' => 'ratename',
                    },
   },
-  'fieldorder' => [qw( setup_fee recur_flat unused_credit ratenum ignore_unrateable )],
+  'fieldorder' => [qw( ratenum ignore_unrateable )],
   'weight' => 40,
 );
 
+sub price_info {
+    my $self = shift;
+    my $str = $self->SUPER::price_info;
+    $str .= " plus usage" if $str;
+    $str;
+}
+
 sub calc_setup {
   my($self, $cust_pkg ) = @_;
   $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 ) = @_;
 
@@ -125,7 +127,7 @@ sub calc_recur {
       } );
 
       warn "  found rate for regionnum $regionnum ".
-           "and rate detail $rate_detail"
+           "and rate detail $rate_detail\n"
         if $DEBUG;
 
       ###
@@ -152,45 +154,38 @@ 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'}),
+        time2str("%c", $session->{'acctstarttime'}),
+        $minutes.'m',
+        '$'.$charge,
+        "+$countrycode $dest",
+        $rate_region->regionname,
+      );
 
       warn "  adding details on charge to invoice: ".
-           join(' - ',
-             time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
-             "+$countrycode $dest",
-             $rate_region->regionname,
-             $minutes.'m',
-             '$'.$charge,
-           )
+           join(' - ', @call_details )
         if $DEBUG;
 
-      push @$details, 
-        #[
-        join(' - ',
-          time2str("%Y %b %d - %r", $session->{'acctstarttime'}),
-          "+$countrycode $dest",
-          $rate_region->regionname,
-          $minutes.'m',
-          '$'.$charge,
-        #]
-        )
-      ;
+      push @$details, join(' - ', @call_details); #\@call_details,
 
     } # $session
 
   } # $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;