projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pass cust_bill_pkg_detail as hash, not a long ordered list. duh.
[freeside.git]
/
FS
/
FS
/
part_pkg
/
voip_cdr.pm
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
81de0bd
..
ada91c6
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-768,33
+768,33
@@
sub calc_usage {
if ( scalar(@call_details) == 1 ) {
$call_details =
if ( scalar(@call_details) == 1 ) {
$call_details =
-
[
'C',
- $call_details[0],
- $charge,
- $classnum,
- $phonenum,
- $cdr->accountcode,
- $cdr->startdate,
- $seconds,
- $regionname,
-
]
;
+
{ format =>
'C',
+
detail =>
$call_details[0],
+
amount =>
$charge,
+
classnum =>
$classnum,
+
phonenum =>
$phonenum,
+
accountcode =>
$cdr->accountcode,
+
startdate =>
$cdr->startdate,
+
duration =>
$seconds,
+
regionname =>
$regionname,
+
}
;
} else { #only used for $rating_method eq 'upstream' now
$csv->combine(@call_details);
$call_details =
} else { #only used for $rating_method eq 'upstream' now
$csv->combine(@call_details);
$call_details =
-
[
'C',
- $csv->string,
- $charge,
- $classnum,
- $phonenum,
- $cdr->accountcode,
- $cdr->startdate,
- $seconds,
- $regionname,
-
]
;
+
{ format =>
'C',
+
detail =>
$csv->string,
+
amount =>
$charge,
+
classnum =>
$classnum,
+
phonenum =>
$phonenum,
+
accountcode =>
$cdr->accountcode,
+
startdate =>
$cdr->startdate,
+
duration =>
$seconds,
+
regionname =>
$regionname,
+
}
;
}
}
- warn " adding details on charge to invoice: [ ".
- join(', ', @{$call_details} ). " ]"
- if ( $DEBUG && ref($call_details) );
+
#
warn " adding details on charge to invoice: [ ".
+
#
join(', ', @{$call_details} ). " ]"
+
#
if ( $DEBUG && ref($call_details) );
push @invoice_details_sort, [ $call_details, $cdr->calldate_unix ];
}
push @invoice_details_sort, [ $call_details, $cdr->calldate_unix ];
}
@@
-821,14
+821,9
@@
sub calc_usage {
} # $cust_svc
} # $cust_svc
- unshift @$details, [ 'C',
- FS::cdr::invoice_header($output_format),
- '',
- '',
- '',
- '',
- '',
- ]
+ unshift @$details, { format => 'C',
+ detail => FS::cdr::invoice_header($output_format),
+ }
if @$details && $rating_method ne 'upstream';
# if ( $spool_cdr && length($downstream_cdr) ) {
if @$details && $rating_method ne 'upstream';
# if ( $spool_cdr && length($downstream_cdr) ) {