projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respect granularity settings for display of inbound call duration, #71715
[freeside.git]
/
FS
/
FS
/
part_pkg
/
voip_inbound.pm
diff --git
a/FS/FS/part_pkg/voip_inbound.pm
b/FS/FS/part_pkg/voip_inbound.pm
index
ec95c90
..
e911439
100644
(file)
--- a/
FS/FS/part_pkg/voip_inbound.pm
+++ b/
FS/FS/part_pkg/voip_inbound.pm
@@
-167,7
+167,7
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
sub price_info {
my $self = shift;
sub price_info {
my $self = shift;
- my $str = $self->SUPER::price_info;
+ my $str = $self->SUPER::price_info
(@_)
;
$str .= " plus usage" if $str;
$str;
}
$str .= " plus usage" if $str;
$str;
}
@@
-214,11
+214,16
@@
sub calc_usage {
# my $downstream_cdr = '';
my $included_min = $self->option('min_included', 1) || 0;
# my $downstream_cdr = '';
my $included_min = $self->option('min_included', 1) || 0;
+ $included_min *= ($cust_pkg->quantity || 1);
my $use_duration = $self->option('use_duration');
my $output_format = $self->option('output_format', 1) || 'default';
my $formatter =
my $use_duration = $self->option('use_duration');
my $output_format = $self->option('output_format', 1) || 'default';
my $formatter =
- FS::detail_format->new($output_format, buffer => $details, inbound => 1);
+ FS::detail_format->new($output_format,
+ buffer => $details,
+ inbound => 1,
+ locale => $cust_pkg->cust_main->locale
+ );
my $granularity = length($self->option('sec_granularity'))
? $self->option('sec_granularity')
my $granularity = length($self->option('sec_granularity'))
? $self->option('sec_granularity')
@@
-287,10
+292,7
@@
sub calc_usage {
my @call_details = (
$cdr->downstream_csv( 'format' => $output_format,
'charge' => $charge,
my @call_details = (
$cdr->downstream_csv( 'format' => $output_format,
'charge' => $charge,
- 'seconds' => ($use_duration
- ? $cdr->duration
- : $cdr->billsec
- ),
+ 'seconds' => $seconds,
'granularity' => $granularity,
)
);
'granularity' => $granularity,
)
);
@@
-312,10
+314,10
@@
sub calc_usage {
'done',
$charge,
$cust_svc->svcnum,
'done',
$charge,
$cust_svc->svcnum,
- 'rated_seconds' => $
use_duration ? $cdr->duration : $cdr->billsec
,
+ 'rated_seconds' => $
seconds
,
'rated_granularity' => $granularity,
'rated_classnum' => $cdr->calltypenum,
'rated_granularity' => $granularity,
'rated_classnum' => $cdr->calltypenum,
- 'inbound' => 1,
+ 'inbound' => 1,
# to update cdr_termination, not cdr
);
die $error if $error;
$formatter->append($cdr);
);
die $error if $error;
$formatter->append($cdr);