projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reduce memory usage of voip_tiered, RT#14903
[freeside.git]
/
FS
/
FS
/
cdr.pm
diff --git
a/FS/FS/cdr.pm
b/FS/FS/cdr.pm
index
65ca50b
..
1507dde
100644
(file)
--- a/
FS/FS/cdr.pm
+++ b/
FS/FS/cdr.pm
@@
-130,9
+130,9
@@
following fields are currently supported:
=item svcnum - Link to customer service (see L<FS::cust_svc>)
=item svcnum - Link to customer service (see L<FS::cust_svc>)
-=item freesidestatus - NULL,
done (or something)
+=item freesidestatus - NULL,
processing-tiered, done
-=item freesiderewritestatus - NULL, done
(or something)
+=item freesiderewritestatus - NULL, done
, skipped
=item cdrbatch
=item cdrbatch
@@
-401,13
+401,12
@@
error, otherwise returns false.
sub set_status_and_rated_price {
my($self, $status, $rated_price, $svcnum, %opt) = @_;
sub set_status_and_rated_price {
my($self, $status, $rated_price, $svcnum, %opt) = @_;
- if($opt{'inbound'}) {
- my $term = qsearchs('cdr_termination', {
- acctid => $self->acctid,
- termpart => 1 # inbound
- });
+
+ if ($opt{'inbound'}) {
+
+ my $term = $self->cdr_termination( 1 ); #1: inbound
my $error;
my $error;
- if
($term
) {
+ if
( $term
) {
warn "replacing existing cdr status (".$self->acctid.")\n" if $term;
$error = $term->delete;
return $error if $error;
warn "replacing existing cdr status (".$self->acctid.")\n" if $term;
$error = $term->delete;
return $error if $error;
@@
-417,18
+416,47
@@
sub set_status_and_rated_price {
termpart => 1,
rated_price => $rated_price,
status => $status,
termpart => 1,
rated_price => $rated_price,
status => $status,
- svcnum => $svcnum,
});
});
+ $term->rated_seconds($opt{rated_seconds}) if exists($opt{rated_seconds});
+ $term->rated_minutes($opt{rated_minutes}) if exists($opt{rated_minutes});
+ $term->svcnum($svcnum) if $svcnum;
return $term->insert;
return $term->insert;
- }
- else {
+
+ } else {
+
$self->freesidestatus($status);
$self->rated_price($rated_price);
$self->freesidestatus($status);
$self->rated_price($rated_price);
+ $self->rated_seconds($opt{rated_seconds}) if exists($opt{rated_seconds});
+ $self->rated_minutes($opt{rated_minutes}) if exists($opt{rated_minutes});
$self->svcnum($svcnum) if $svcnum;
return $self->replace();
$self->svcnum($svcnum) if $svcnum;
return $self->replace();
+
}
}
}
}
+=item cdr_termination [ TERMPART ]
+
+=cut
+
+sub cdr_termination {
+ my $self = shift;
+
+ if ( scalar(@_) && $_[0] ) {
+ my $termpart = shift;
+
+ qsearchs('cdr_termination', { acctid => $self->acctid,
+ termpart => $termpart,
+ }
+ );
+
+ } else {
+
+ qsearch('cdr_termination', { acctid => $self->acctid, } );
+
+ }
+
+}
+
=item calldate_unix
Parses the calldate in SQL string format and returns a UNIX timestamp.
=item calldate_unix
Parses the calldate in SQL string format and returns a UNIX timestamp.
@@
-541,6
+569,10
@@
my %export_names = (
'name' => 'Default plus accountcode',
'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price',
},
'name' => 'Default plus accountcode',
'invoice_header' => 'Date,Time,Account,Number,Destination,Duration,Price',
},
+ 'description_default' => {
+ 'name' => 'Default with description field as destination',
+ 'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
+ },
);
my %export_formats = ();
);
my %export_formats = ();
@@
-556,11
+588,11
@@
sub export_formats {
my $duration_sub = sub {
my($cdr, %opt) = @_;
my $sec = $opt{seconds} || $cdr->billsec;
my $duration_sub = sub {
my($cdr, %opt) = @_;
my $sec = $opt{seconds} || $cdr->billsec;
- if (
length($opt{granularity})
&&
+ if (
defined $opt{granularity}
&&
$opt{granularity} == 0 ) { #per call
return '1 call';
}
$opt{granularity} == 0 ) { #per call
return '1 call';
}
- elsif ( $opt{granularity} == 60 ) {#full minutes
+ elsif (
defined $opt{granularity} &&
$opt{granularity} == 60 ) {#full minutes
my $min = int($sec/60);
$min++ if $sec%60;
return $min.'m';
my $min = int($sec/60);
$min++ if $sec%60;
return $min.'m';
@@
-616,7
+648,10
@@
sub export_formats {
$duration_sub,
#PRICE
$duration_sub,
#PRICE
- sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; },
+ sub { my($cdr, %opt) = @_;
+ $opt{charge} = '0.00' unless defined $opt{charge};
+ $opt{money_char}.$opt{charge};
+ },
],
);
],
);
@@
-626,10
+661,29
@@
sub export_formats {
'accountcode',
@{ $export_formats{'default'} }[2..5],
];
'accountcode',
@{ $export_formats{'default'} }[2..5],
];
+ my @default = @{ $export_formats{'default'} };
+ $export_formats{'description_default'} =
+ [ 'src', @default[0..2],
+ sub { my($cdr, %opt) = @_; $cdr->description },
+ @default[4,5] ];
- %export_formats
+ return %export_formats;
}
}
+=item downstream_csv OPTION => VALUE ...
+
+Options:
+
+format
+
+charge
+
+seconds
+
+granularity
+
+=cut
+
sub downstream_csv {
my( $self, %opt ) = @_;
sub downstream_csv {
my( $self, %opt ) = @_;
@@
-651,6
+705,8
@@
sub downstream_csv {
}
@{ $formats{$format} };
}
@{ $formats{$format} };
+ return @columns if defined $opt{'keeparray'};
+
my $status = $csv->combine(@columns);
die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
unless $status;
my $status = $csv->combine(@columns);
die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
unless $status;
@@
-717,14
+773,13
@@
sub clear_status {
return $error;
}
return $error;
}
- my @cdr_termination = qsearch('cdr_termination',
- { 'acctid' => $self->acctid } );
- foreach my $cdr_termination ( @cdr_termination ) {
- $cdr_termination->status('');
- $error = $cdr_termination->replace;
+ foreach my $cdr_termination ( $self->cdr_termination ) {
+ #$cdr_termination->status('');
+ #$error = $cdr_termination->replace;
+ $error = $cdr_termination->delete;
if ( $error ) {
if ( $error ) {
- $dbh->rollback if $oldAutoCommit;
- return $error;
+
$dbh->rollback if $oldAutoCommit;
+
return $error;
}
}
}
}
@@
-897,7
+952,7
@@
my %import_options = (
},
#drop the || 'csv' to allow auto xls for csv types?
},
#drop the || 'csv' to allow auto xls for csv types?
- 'format_types' => { map { $_ =>
( lc($cdr_info{$_}->{'type'}) || 'csv'
); }
+ 'format_types' => { map { $_ =>
lc($cdr_info{$_}->{'type'} || 'csv'
); }
keys %cdr_info
},
keys %cdr_info
},
@@
-934,6
+989,14
@@
sub batch_import {
my $iopt = _import_options;
$opt->{$_} = $iopt->{$_} foreach keys %$iopt;
my $iopt = _import_options;
$opt->{$_} = $iopt->{$_} foreach keys %$iopt;
+ if ( defined $opt->{'cdrtypenum'} ) {
+ $opt->{'preinsert_callback'} = sub {
+ my($record,$param) = (shift,shift);
+ $record->cdrtypenum($opt->{'cdrtypenum'});
+ '';
+ };
+ }
+
FS::Record::batch_import( $opt );
}
FS::Record::batch_import( $opt );
}