projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSL status pulling, RT#13656
[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
7b80e02
..
e3af5aa
100644
(file)
--- a/
FS/FS/part_pkg/voip_inbound.pm
+++ b/
FS/FS/part_pkg/voip_inbound.pm
@@
-24,7
+24,7
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
%info = (
'name' => 'VoIP flat rate pricing of CDRs for inbound calls',
'shortname' => 'VoIP/telco CDR rating (inbound)',
%info = (
'name' => 'VoIP flat rate pricing of CDRs for inbound calls',
'shortname' => 'VoIP/telco CDR rating (inbound)',
- 'inherit_fields' => [ 'global_Mixin' ],
+ 'inherit_fields' => [ '
prorate_Mixin', '
global_Mixin' ],
'fields' => {
#false laziness w/flat.pm
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
'fields' => {
#false laziness w/flat.pm
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
@@
-35,10
+35,6
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
'subscription',
'default' => '1',
},
'subscription',
'default' => '1',
},
- 'add_full_period'=> { 'name' => 'When prorating first month, also bill '.
- 'for one full period after that',
- 'type' => 'checkbox',
- },
'recur_method' => { 'name' => 'Recurring fee method',
'type' => 'select',
'recur_method' => { 'name' => 'Recurring fee method',
'type' => 'select',
@@
-64,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: ',
@@
-80,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:',
@@
-148,8
+144,9
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
},
'fieldorder' => [qw(
recur_temporality
},
'fieldorder' => [qw(
recur_temporality
- recur_method cutoff_day add_full_period
- min_charge min_included sec_granularity
+ recur_method cutoff_day ),
+ FS::part_pkg::prorate_Mixin::fieldorder,
+ qw( min_charge min_included sec_granularity
default_prefix
disable_tollfree
use_amaflags
default_prefix
disable_tollfree
use_amaflags
@@
-173,11
+170,6
@@
sub price_info {
$str;
}
$str;
}
-sub calc_setup {
- my($self, $cust_pkg ) = @_;
- $self->option('setup_fee');
-}
-
sub calc_recur {
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
sub calc_recur {
my $self = shift;
my($cust_pkg, $sdate, $details, $param ) = @_;
@@
-275,17
+267,21
@@
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 ) {
$charges += $charge;
+ 0.00000001 ); #so 1.00005 rounds to 1.0001
if ( $charge > 0 ) {
$charges += $charge;
- my @call_details = ($cdr->downstream_csv( 'format' => $output_format,
- 'charge' => $charge,
- 'minutes' => $minutes,
- 'granularity' => $granularity,
- )
- );
+ my @call_details = (
+ $cdr->downstream_csv( 'format' => $output_format,
+ 'charge' => $charge,
+ 'seconds' => ($use_duration
+ ? $cdr->duration
+ : $cdr->billsec
+ ),
+ 'granularity' => $granularity,
+ )
+ );
push @$details,
[ 'C',
$call_details[0],
push @$details,
[ 'C',
$call_details[0],
@@
-293,6
+289,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
];