X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fvoip_sqlradacct.pm;h=bf18003ab6eeb3a6341d716670acbbac12910699;hp=482f87b245e3f91054a4b842995202ef8a035ea2;hb=fadaa67e77ad8d5d966e252aba7f193e9e3840e3;hpb=34c53b4de70c89194ad0564d1f2a133b93769f05

diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index 482f87b24..bf18003ab 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;
 
@@ -18,7 +18,7 @@ $DEBUG = 1;
     'setup_fee'     => { 'name' => 'Setup fee for this package',
                          'default' => 0,
                        },
-    'recur_flat'     => { 'name' => 'Base monthly charge for this package',
+    'recur_flat'     => { 'name' => 'Base recurring fee for this package',
                           'default' => 0,
                         },
     'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
@@ -41,6 +41,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 ) = @_;
 
@@ -126,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;
 
       ###
@@ -153,29 +154,22 @@ 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