projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
752c8c3
)
show duration before connection charge period, RT#29497
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 29 Jun 2014 06:03:20 +0000
(23:03 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 29 Jun 2014 06:03:20 +0000
(23:03 -0700)
FS/FS/cdr.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cdr.pm
b/FS/FS/cdr.pm
index
8113412
..
cced0eb
100644
(file)
--- a/
FS/FS/cdr.pm
+++ b/
FS/FS/cdr.pm
@@
-825,9
+825,10
@@
sub rate_prefix {
# We don't round _anything_ (except granularizing)
# until the final $charge = sprintf("%.2f"...).
# We don't round _anything_ (except granularizing)
# until the final $charge = sprintf("%.2f"...).
- my $seconds_left = $part_pkg->option_cacheable('use_duration')
- ? $self->duration
- : $self->billsec;
+ my $rated_seconds = $part_pkg->option_cacheable('use_duration')
+ ? $self->duration
+ : $self->billsec;
+ my $seconds_left = $rated_seconds;
#no, do this later so it respects (group) included minutes
# # charge for the first (conn_sec) seconds
#no, do this later so it respects (group) included minutes
# # charge for the first (conn_sec) seconds
@@
-835,7
+836,7
@@
sub rate_prefix {
# $seconds_left -= $seconds;
# $weektime += $seconds;
# my $charge = $rate_detail->conn_charge;
# $seconds_left -= $seconds;
# $weektime += $seconds;
# my $charge = $rate_detail->conn_charge;
- my $seconds = 0;
+
#
my $seconds = 0;
my $charge = 0;
my $connection_charged = 0;
my $charge = 0;
my $connection_charged = 0;
@@
-893,7
+894,7
@@
sub rate_prefix {
$seconds_left = 0;
}
$seconds_left = 0;
}
- $seconds += $charge_sec;
+
#
$seconds += $charge_sec;
if ( $rate_detail->min_included ) {
# the old, kind of deprecated way to do this:
if ( $rate_detail->min_included ) {
# the old, kind of deprecated way to do this:
@@
-987,7
+988,7
@@
sub rate_prefix {
$opt{'svcnum'},
'rated_pretty_dst' => $pretty_dst,
'rated_regionname' => $rate_region->regionname,
$opt{'svcnum'},
'rated_pretty_dst' => $pretty_dst,
'rated_regionname' => $rate_region->regionname,
- 'rated_seconds' => $seconds,
+ 'rated_seconds' => $
rated_seconds, #$
seconds,
'rated_granularity' => $rate_detail->sec_granularity, #$granularity
'rated_ratedetailnum' => $rate_detail->ratedetailnum,
'rated_classnum' => $rate_detail->classnum, #rated_ratedetailnum?
'rated_granularity' => $rate_detail->sec_granularity, #$granularity
'rated_ratedetailnum' => $rate_detail->ratedetailnum,
'rated_classnum' => $rate_detail->classnum, #rated_ratedetailnum?
@@
-1255,7
+1256,7
@@
sub export_formats {
my $conf = new FS::Conf;
my $date_format = $conf->config('date_format') || '%m/%d/%Y';
my $conf = new FS::Conf;
my $date_format = $conf->config('date_format') || '%m/%d/%Y';
- # call duration in the largest units that accurately reflect the
granularity
+ # call duration in the largest units that accurately reflect the granularity
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;