projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c846f76
)
include rate_detail->conn_sec in displayed duration #RT8605
author
jeff
<jeff>
Tue, 13 Jul 2010 20:32:20 +0000
(20:32 +0000)
committer
jeff
<jeff>
Tue, 13 Jul 2010 20:32:20 +0000
(20:32 +0000)
FS/FS/part_pkg/voip_cdr.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
eb6727a
..
de47b45
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-549,8
+549,13
@@
sub calc_usage {
my $minutes = sprintf("%.1f", $seconds / 60);
$minutes =~ s/\.0$// if $granularity == 60;
my $minutes = sprintf("%.1f", $seconds / 60);
$minutes =~ s/\.0$// if $granularity == 60;
+ my $duration_minutes = #for invoice display purposes
+ sprintf("%.1f", ($seconds + $rate_detail->conn_sec)/ 60);
+ $duration_minutes =~ s/\.0$// if $granularity == 60;
+
# per call rather than per minute
$minutes = 1 unless $granularity;
# per call rather than per minute
$minutes = 1 unless $granularity;
+ $duration_minutes = 1 unless $granularity;
$included_min{$regionnum} -= $minutes;
$included_min{$regionnum} -= $minutes;
@@
-573,7
+578,7
@@
sub calc_usage {
@call_details = (
$cdr->downstream_csv( 'format' => $output_format,
'granularity' => $granularity,
@call_details = (
$cdr->downstream_csv( 'format' => $output_format,
'granularity' => $granularity,
- 'minutes' => $minutes,
+ 'minutes' => $
duration_
minutes,
'charge' => $charge,
'pretty_dst' => $pretty_destnum,
'dst_regionname' => $regionname,
'charge' => $charge,
'pretty_dst' => $pretty_destnum,
'dst_regionname' => $regionname,