diff options
author | Ivan Kohler <ivan@freeside.biz> | 2014-06-28 23:03:20 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2014-06-28 23:03:20 -0700 |
commit | 3ed189ae0f3d1a6fd082fe8d53d888dc4cd57ad2 (patch) | |
tree | a0347965ada1f98cce48c4b706204568b5b178f7 /FS/FS/cdr.pm | |
parent | 752c8c301644253af3ed8a316e93345bbe016c45 (diff) |
show duration before connection charge period, RT#29497
Diffstat (limited to 'FS/FS/cdr.pm')
-rw-r--r-- | FS/FS/cdr.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index 8113412..cced0eb 100644 --- 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"...). - 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 @@ -835,7 +836,7 @@ sub rate_prefix { # $seconds_left -= $seconds; # $weektime += $seconds; # my $charge = $rate_detail->conn_charge; - my $seconds = 0; + #my $seconds = 0; my $charge = 0; my $connection_charged = 0; @@ -893,7 +894,7 @@ sub rate_prefix { $seconds_left = 0; } - $seconds += $charge_sec; + #$seconds += $charge_sec; 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, - '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? @@ -1255,7 +1256,7 @@ sub export_formats { 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; |