projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate dups, RT#85671
[freeside.git]
/
FS
/
FS
/
cdr
/
amcom.pm
diff --git
a/FS/FS/cdr/amcom.pm
b/FS/FS/cdr/amcom.pm
index
697a682
..
4fb94ee
100644
(file)
--- a/
FS/FS/cdr/amcom.pm
+++ b/
FS/FS/cdr/amcom.pm
@@
-2,9
+2,9
@@
package FS::cdr::amcom;
use strict;
use base qw( FS::cdr );
use strict;
use base qw( FS::cdr );
-use vars qw( %info
%cdrtypes
);
+use vars qw( %info );
use DateTime;
use DateTime;
-use FS::Record qw( qsearch );
+use FS::Record qw( qsearch
s
);
use FS::cdr_type;
my ($tmp_mday, $tmp_mon, $tmp_year);
use FS::cdr_type;
my ($tmp_mday, $tmp_mon, $tmp_year);
@@
-16,12
+16,6
@@
my ($tmp_mday, $tmp_mon, $tmp_year);
'type' => 'csv',
'sep_char' => ',',
'disabled' => 0,
'type' => 'csv',
'sep_char' => ',',
'disabled' => 0,
- 'header_buffer' => sub {
-
- %cdrtypes = ( map { $_->cdrtypename => $_->cdrtypenum }
- qsearch('cdr_type', {})
- );
- },
#listref of what to do with each field from the CDR, in order
'import_fields' => [
#listref of what to do with each field from the CDR, in order
'import_fields' => [
@@
-43,7
+37,9
@@
my ($tmp_mday, $tmp_mon, $tmp_year);
sub { # 5. Call Category (LOCAL, NATIONAL, FREECALL, MOBILE)
my ($cdr, $data) = @_;
$data ||= 'none';
sub { # 5. Call Category (LOCAL, NATIONAL, FREECALL, MOBILE)
my ($cdr, $data) = @_;
$data ||= 'none';
- $cdr->cdrtypenum($cdrtypes{$data} || '');
+
+ my $cdr_type = qsearchs('cdr_type', { 'cdrtypename' => $data } );
+ $cdr->set('cdrtypenum', $cdr_type->cdrtypenum) if $cdr_type;
$cdr->set('dcontext', $data);
},
sub { # 6. Start Date (DDMMYYYY
$cdr->set('dcontext', $data);
},
sub { # 6. Start Date (DDMMYYYY