projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee16187
)
skip_max_callers meaning was reversed. doh! RT#9907
author
ivan
<ivan>
Tue, 21 Sep 2010 03:56:02 +0000
(
03:56
+0000)
committer
ivan
<ivan>
Tue, 21 Sep 2010 03:56:02 +0000
(
03:56
+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
41c0888
..
321be2a
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-95,6
+95,10
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'select_label' => 'ratename',
},
'select_label' => 'ratename',
},
+ 'min_included' => { 'name' => 'Minutes included when using "single price per minute" rating method',
+ },
+
+
'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
},
'min_charge' => { 'name' => 'Charge per minute when using "single price per minute" rating method',
},
@@
-185,7
+189,7
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'skip_lastapp' => { 'name' => 'Do not charge for CDRs where the lastapp matches this value: ',
},
'skip_lastapp' => { 'name' => 'Do not charge for CDRs where the lastapp matches this value: ',
},
- 'skip_max_callers' => { 'name' => 'Do not charge for CDRs where max_callers is
greater than
this value: ',
+ 'skip_max_callers' => { 'name' => 'Do not charge for CDRs where max_callers is
less than or equal to
this value: ',
},
'use_duration' => { 'name' => 'Calculate usage based on the duration field instead of the billsec field',
},
'use_duration' => { 'name' => 'Calculate usage based on the duration field instead of the billsec field',
@@
-908,10
+912,10
@@
sub check_chargable {
}
}
- return "max_callers
>
$opt{skip_max_callers}"
+ return "max_callers
<=
$opt{skip_max_callers}"
if length($opt{'skip_max_callers'})
and length($cdr->max_callers)
if length($opt{'skip_max_callers'})
and length($cdr->max_callers)
- and $cdr->max_callers
>
$opt{'skip_max_callers'};
+ and $cdr->max_callers
<=
$opt{'skip_max_callers'};
#all right then, rate it
'';
#all right then, rate it
'';