projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4 decimal places for inbound rating, RT#14687
[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
a96e978
..
ec7dad6
100644
(file)
--- a/
FS/FS/part_pkg/voip_inbound.pm
+++ b/
FS/FS/part_pkg/voip_inbound.pm
@@
-60,14
+60,14
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'type' => 'checkbox',
},
'type' => 'checkbox',
},
- 'use_amaflags' => { 'name' => '
Do not charge for CDRs where the amaflags field is not
set to "2" ("BILL"/"BILLING").',
+ 'use_amaflags' => { 'name' => '
Only charge for CDRs where the amaflags field is
set to "2" ("BILL"/"BILLING").',
'type' => 'checkbox',
},
'type' => 'checkbox',
},
- 'use_carrierid' => { 'name' => '
Do not charge for CDRs where the Carrier ID is not
set to: ',
+ 'use_carrierid' => { 'name' => '
Only charge for CDRs where the Carrier ID is
set to: ',
},
},
- 'use_cdrtypenum' => { 'name' => '
Do not charge for CDRs where the CDR Type is not
set to: ',
+ 'use_cdrtypenum' => { 'name' => '
Only charge for CDRs where the CDR Type is
set to: ',
},
'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to: ',
},
'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to: ',
@@
-76,7
+76,7
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'ignore_disposition' => { 'name' => 'Do not charge for CDRs where the Disposition is set to any of these (comma-separated) values: ',
},
'ignore_disposition' => { 'name' => 'Do not charge for CDRs where the Disposition is set to any of these (comma-separated) values: ',
},
- 'disposition_in' => { 'name' => '
Do not charge for CDRs where the Disposition is not
set to any of these (comma-separated) values: ',
+ 'disposition_in' => { 'name' => '
Only charge for CDRs where the Disposition is
set to any of these (comma-separated) values: ',
},
'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values:',
},
'skip_dcontext' => { 'name' => 'Do not charge for CDRs where the dcontext is set to any of these (comma-separated) values:',
@@
-267,7
+267,7
@@
sub calc_usage {
$included_min = 0;
}
$included_min = 0;
}
- $charge = sprintf('%.
2
f', ( $self->option('min_charge') * $charge_min )
+ $charge = sprintf('%.
4
f', ( $self->option('min_charge') * $charge_min )
+ 0.00000001 ); #so 1.00005 rounds to 1.0001
if ( $charge > 0 ) {
+ 0.00000001 ); #so 1.00005 rounds to 1.0001
if ( $charge > 0 ) {
@@
-285,6
+285,7
@@
sub calc_usage {
$cdr->calltypenum, #classnum
$self->phonenum,
$cdr->accountcode,
$cdr->calltypenum, #classnum
$self->phonenum,
$cdr->accountcode,
+ $cdr->startdate,
$seconds,
'', #regionname, not set for inbound calls
];
$seconds,
'', #regionname, not set for inbound calls
];