},
'default' => {
'name' => 'Default',
- 'invoice_header' => 'Date,Time,Duration,Price,Number,Destination',
+ 'invoice_header' => 'Date,Time,Number,Destination,Duration,Price',
},
'source_default' => {
'name' => 'Default with source',
- 'invoice_header' => 'Caller,Date,Time,Duration,Number,Destination,Price',
+ 'invoice_header' => 'Caller,Date,Time,Number,Destination,Duration,Price',
},
);
'userfield', #USER
'dst', #NUMBER_DIALED
sub { sprintf('%.2fm', shift->billsec / 60 ) }, #DURATION
- sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
+ #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
+ sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE
],
'simple2' => [
sub { time2str('%D', shift->calldate_unix ) }, #DATE
'dst', #NUMBER_DIALED
'src', #called from
sub { sprintf('%.2fm', shift->billsec / 60 ) }, #DURATION
- sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
+ #sub { sprintf('%.3f', shift->upstream_price ) }, #PRICE
+ sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; }, #PRICE
],
'default' => [
sub { time2str('%r', shift->calldate_unix ) },
# time2str("%c", $cdr->calldate_unix), #XXX this should probably be a config option dropdown so they can select US vs- rest of world dates or whatnot
+ #DEST ("Number")
+ sub { my($cdr, %opt) = @_; $opt{pretty_dst} || $cdr->dst; },
+
+ #REGIONNAME ("Destination")
+ sub { my($cdr, %opt) = @_; $opt{dst_regionname}; },
+
#DURATION
sub { my($cdr, %opt) = @_;
$opt{minutes}. ( $opt{granularity} ? 'm' : ' call' );
#PRICE
sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; },
- #DEST ("Number")
- sub { my($cdr, %opt) = @_; $opt{pretty_dst} || $cdr->dst; },
-
- #REGIONNAME ("Destination")
- sub { my($cdr, %opt) = @_; $opt{dst_regionname}; },
-
],
);
-$export_formats{'source_default'} = [ 'src',
- @{ $export_formats{'default'} }[0..2],
- @{ $export_formats{'default'} }[4..5],
- @{ $export_formats{'default'} }[3],
- ];
+$export_formats{'source_default'} = [ 'src', @{ $export_formats{'default'} }, ];
sub downstream_csv {
my( $self, %opt ) = @_;