X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcdr%2Fenswitch.pm;h=70542b20cd8ce87583ce53380674d8d1076924c0;hb=14af2debcb12f781a3f952f0bccd5be82ae7f964;hp=1475d8dc19b4080351f98d20b09a88e061109b33;hpb=3595df85a4211d9da1fd3bd8cbb0f324881491d9;p=freeside.git

diff --git a/FS/FS/cdr/enswitch.pm b/FS/FS/cdr/enswitch.pm
index 1475d8dc1..70542b20c 100644
--- a/FS/FS/cdr/enswitch.pm
+++ b/FS/FS/cdr/enswitch.pm
@@ -1,11 +1,10 @@
 package FS::cdr::enswitch;
+use base qw( FS::cdr );
 
 use strict;
-use vars qw( @ISA %info $tmp_mon $tmp_mday $tmp_year );
-use Time::Local;
-use FS::cdr qw(_cdr_min_parser_maker);
-
-@ISA = qw(FS::cdr);
+use vars qw( %info $tmp_mon $tmp_mday $tmp_year );
+use FS::Record qw( qsearchs );
+use FS::cdr_type;
 
 %info = (
   'name'          => 'Enswitch',
@@ -23,14 +22,14 @@ use FS::cdr qw(_cdr_min_parser_maker);
     'clid',         #Calling name
     skip(1),        #Called type
     'dst',          #Called number
-    skip(5),        #Destination customer, Destination type
+    skip(10),       #Destination customer, Destination type
                     #Destination number
                     #Destination group ID, Destination group name,
-    'in_calling_type',  #Inbound calling type,
+    \&in_calling_type,  #Inbound calling type,
     \&in_calling_num,   #Inbound calling number,
     '',                 #Inbound called type,
     \&in_called_num,    #Inbound called number,
-    skip(14),
+    skip(11),
                     #Inbound destination type, Inbound destination number,
                     #Outbound calling type, Outbound calling number,
                     #Outbound called type, Outbound called number,
@@ -42,6 +41,7 @@ use FS::cdr qw(_cdr_min_parser_maker);
     skip(1),        #Ring seconds
     'billsec',      #Billable seconds
     'upstream_price', #Cost
+    skip(1),        #Cost including taxes
     'accountcode',  #Billing customer
     skip(3),        #Billing customer name, Billing type, Billing reference
   ],
@@ -49,6 +49,25 @@ use FS::cdr qw(_cdr_min_parser_maker);
 
 sub skip { map {''} (1..$_[0]) }
 
+#create CDR types with names matching in_calling_type valuesj - 'none'
+# (without the quotes) for blank
+our %cdr_type = ();
+sub in_calling_type {
+  my ($record, $data) = @_;
+
+  $data ||= 'none';
+
+  my $cdr_type = exists($cdr_type{$data})
+                   ? $cdr_type{$data}
+                   : qsearchs('cdr_type', { 'cdrtypename' => $data } );
+
+  $cdr_type{$data} = $cdr_type;
+
+  $record->set('in_calling_type', $data); #for below
+  $record->set('cdrtypenum', $cdr_type->cdrtypenum) if $cdr_type;
+
+}
+
 sub in_calling_num {
   my ($record, $data) = @_;
   $record->src($data) if ( ($record->in_calling_type || '') eq 'external' );