add desc method to cust_bill_pkg and use it in cust_bill... this should help with...

[freeside.git] / FS / FS / part_pkg / voip_sqlradacct.pm

diff --git a/FS/FS/part_pkg/voip_sqlradacct.pm b/FS/FS/part_pkg/voip_sqlradacct.pm
index cbd1654..382ebac 100644 (file)
--- 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;
 
@@ -153,29 +153,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