projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make region group included minutes work again, probably fallout from #5738
[freeside.git]
/
FS
/
FS
/
part_pkg
/
voip_cdr.pm
diff --git
a/FS/FS/part_pkg/voip_cdr.pm
b/FS/FS/part_pkg/voip_cdr.pm
index
5a27f06
..
ba5e711
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-61,6
+61,11
@@
tie my %detail_formats, 'Tie::IxHash',
FS::cdr::invoice_formats()
;
FS::cdr::invoice_formats()
;
+tie my %accountcode_tollfree_field, 'Tie::IxHash',
+ 'dst' => 'Destination (dst)',
+ 'src' => 'Source (src)',
+;
+
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
'shortname' => 'VoIP/telco CDR rating (standard)',
%info = (
'name' => 'VoIP rating by plan of CDR records in an internal (or external) SQL table',
'shortname' => 'VoIP/telco CDR rating (standard)',
@@
-211,6
+216,12
@@
tie my %detail_formats, 'Tie::IxHash',
'empty_label' => '',
},
'empty_label' => '',
},
+ 'accountcode_tollfree_field' => {
+ 'name' => 'When using an alternate rate plan for toll-free accountcodes, the CDR field to use in rating calculations',
+ 'type' => 'select',
+ 'select_options' => \%accountcode_tollfree_field,
+ },
+
'skip_dst_length_less' => { 'name' => 'Do not charge for CDRs where the destination is less than this many digits:',
},
'skip_dst_length_less' => { 'name' => 'Do not charge for CDRs where the destination is less than this many digits:',
},
@@
-268,7
+279,7
@@
tie my %detail_formats, 'Tie::IxHash',
},
#eofalse
},
#eofalse
- 'usage_
nozero' => { 'name' => 'Omit
details for included / no-charge calls.',
+ 'usage_
showzero' => { 'name' => 'Show
details for included / no-charge calls.',
'type' => 'checkbox',
},
'type' => 'checkbox',
},
@@
-330,7
+341,7
@@
tie my %detail_formats, 'Tie::IxHash',
skip_dcontext skip_dst_prefix
skip_dstchannel_prefix skip_src_length_more
noskip_src_length_accountcode_tollfree
skip_dcontext skip_dst_prefix
skip_dstchannel_prefix skip_src_length_more
noskip_src_length_accountcode_tollfree
- accountcode_tollfree_ratenum
+ accountcode_tollfree_ratenum
accountcode_tollfree_field
skip_dst_length_less
noskip_dst_length_accountcode_tollfree
skip_lastapp
skip_dst_length_less
noskip_dst_length_accountcode_tollfree
skip_lastapp
@@
-341,7
+352,7
@@
tie my %detail_formats, 'Tie::IxHash',
output_format
selfservice_format selfservice_inbound_format
usage_mandate usage_section summarize_usage
output_format
selfservice_format selfservice_inbound_format
usage_mandate usage_section summarize_usage
- usage_
no
zero bill_every_call bill_inactive_svcs
+ usage_
show
zero bill_every_call bill_inactive_svcs
count_available_phones suspend_bill
)
],
count_available_phones suspend_bill
)
],
@@
-391,13
+402,15
@@
sub calc_usage {
my $charges = 0;
my $charges = 0;
- my $included_min = $self->option('min_included', 1) || 0; #single price rating
+ my $included_min = $self->option('min_included', 1) || 0;
+ #single price rating
+ #or region group
+
my $included_calls = $self->option('calls_included', 1) || 0;
my $cdr_svc_method = $self->option('cdr_svc_method',1)||'svc_phone.phonenum';
my $rating_method = $self->option('rating_method') || 'prefix';
my $included_calls = $self->option('calls_included', 1) || 0;
my $cdr_svc_method = $self->option('cdr_svc_method',1)||'svc_phone.phonenum';
my $rating_method = $self->option('rating_method') || 'prefix';
- my $region_group_included_min = $self->option('min_included',1) || 0;
- my %region_group_included_min = ();
+ my %detail_included_min = ();
my $output_format = $self->option('output_format', 'Hush!')
|| ( $rating_method eq 'upstream_simple'
my $output_format = $self->option('output_format', 'Hush!')
|| ( $rating_method eq 'upstream_simple'
@@
-405,9
+418,12
@@
sub calc_usage {
: 'default'
);
: 'default'
);
- my $usage_
nozero = $self->option('usage_no
zero', 1);
+ my $usage_
showzero = $self->option('usage_show
zero', 1);
- my $formatter = FS::detail_format->new($output_format, buffer => $details);
+ my $formatter = FS::detail_format->new($output_format,
+ buffer => $details,
+ locale => $cust_pkg->cust_main->locale
+ );
my $use_duration = $self->option('use_duration');
my $use_duration = $self->option('use_duration');
@@
-456,6
+472,7
@@
sub calc_usage {
#my @invoice_details_sort;
#first rate any outstanding CDRs not yet rated
#my @invoice_details_sort;
#first rate any outstanding CDRs not yet rated
+ # XXX eventually use an FS::Cursor for this
my $cdr_search = $svc_x->psearch_cdrs(%options);
$cdr_search->limit(1000);
$cdr_search->increment(0); # because we're changing their status as we go
my $cdr_search = $svc_x->psearch_cdrs(%options);
$cdr_search->limit(1000);
$cdr_search->increment(0); # because we're changing their status as we go
@@
-465,9
+482,8
@@
sub calc_usage {
'part_pkg' => $self,
'cust_pkg' => $cust_pkg,
'svcnum' => $svc_x->svcnum,
'part_pkg' => $self,
'cust_pkg' => $cust_pkg,
'svcnum' => $svc_x->svcnum,
- 'single_price_included_min' => \$included_min,
- 'region_group_included_min' => \$region_group_included_min,
- 'region_group_included_min_hashref' => \%region_group_included_min,
+ 'plan_included_min' => \$included_min,
+ 'detail_included_min_hashref' => \%detail_included_min,
);
die $error if $error; #??
);
die $error if $error; #??
@@
-497,7
+513,8
@@
sub calc_usage {
$error = $cdr->set_status('done');
}
die $error if $error;
$error = $cdr->set_status('done');
}
die $error if $error;
- $formatter->append($cdr) unless $usage_nozero && $cdr->rated_price == 0;
+ $formatter->append($cdr)
+ unless $cdr->rated_price == 0 and not $usage_showzero;
$cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated';
} #$cdr
$cdr_search->adjust(1) if $cdr->freesidestatus eq 'rated';
} #$cdr
@@
-611,9
+628,12
@@
sub calc_units {
my($self, $cust_pkg ) = @_;
my $count = 0;
if ( $self->option('count_available_phones', 1)) {
my($self, $cust_pkg ) = @_;
my $count = 0;
if ( $self->option('count_available_phones', 1)) {
- map { $count += ( $_->quantity || 0 ) }
- grep { $_->part_svc->svcdb eq 'svc_phone' }
- $cust_pkg->part_pkg->pkg_svc;
+ foreach my $pkg_svc ($cust_pkg->part_pkg->pkg_svc) {
+ if ($pkg_svc->part_svc->svcdb eq 'svc_phone') { # svc_pbx?
+ $count += $pkg_svc->quantity || 0;
+ }
+ }
+ $count *= $cust_pkg->quantity;
} else {
$count =
scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
} else {
$count =
scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);