[freeside-commits] freeside/FS/FS/part_pkg voip_cdr.pm, 1.3.2.7, 1.3.2.8

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv24839/FS/FS/part_pkg

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	voip_cdr.pm 
Log Message:
voxline invoice formatting

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -d -r1.3.2.7 -r1.3.2.8
--- voip_cdr.pm	19 May 2008 04:07:43 -0000	1.3.2.7
+++ voip_cdr.pm	4 Jun 2008 17:57:48 -0000	1.3.2.8
@@ -7,6 +7,7 @@
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch);
 use FS::part_pkg::flat;
+use FS::cdr;
 #use FS::rate;
 #use FS::rate_prefix;
 
@@ -78,6 +79,11 @@
                            'type' => 'checkbox',
                          },
 
+    'output_format' => { 'name' => 'Simple output format',
+                         'type' => 'select',
+                         'select_options' => { FS::cdr::invoice_formats() },
+                       },
+
     #XXX also have option for an external db
 #    'cdr_location' => { 'name' => 'CDR database location'
 #                        'type' => 'select',
@@ -108,7 +114,7 @@
                        default_prefix
                        disable_src
                        domestic_prefix international_prefix
-                       use_amaflags use_disposition
+                       use_amaflags use_disposition output_format
                      )
                   ],
   'weight' => 40,
@@ -135,6 +141,9 @@
 
   my $downstream_cdr = '';
 
+  my $output_format = $self->option('output_format', 'Hush!')
+                      || 'voxlinesystems';
+
   foreach my $cust_svc (
     grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc
   ) {
@@ -291,7 +300,7 @@
         $charge = sprintf('%.3f', $cdr->upstream_price);
         $charges += $charge;
 
-        @call_details = ( $cdr->downstream_csv( 'format' => 'voxlinesystems' ));
+        @call_details = ($cdr->downstream_csv( 'format' => $output_format ));
 
       } else {
         die "don't know how to rate CDRs using method: ".
@@ -361,7 +370,10 @@
             $call_details = join(' - ', @call_details );
           }
           warn "  adding details on charge to invoice: $call_details"
-            if $DEBUG;
+            if ( $DEBUG && !ref($call_details) );
+          warn "  adding details on charge to invoice: [ ".
+              join(', ', @{$call_details} ). " ]"
+            if ( $DEBUG && ref($call_details) );
           push @$details, $call_details; #\@call_details,
         }
 
@@ -378,7 +390,7 @@
 
     } # $cdr
 
-    unshift @$details, [ 'C', "Date,Time,Name,Destination,Duration,Price" ]
+    unshift @$details, [ 'C', FS::cdr::invoice_header( $output_format) ]
       if (@$details && $self->option('rating_method') eq 'upstream_simple' );
 
   } # $cust_svc