projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
not enough sleep to support multiple internal_prefixen, RT#3985
[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
0634cdc
..
794ae01
100644
(file)
--- a/
FS/FS/part_pkg/voip_cdr.pm
+++ b/
FS/FS/part_pkg/voip_cdr.pm
@@
-43,7
+43,7
@@
tie my %temporalities, 'Tie::IxHash',
'default' => 0,
},
'default' => 0,
},
- #
probably useful for other usage-charging price plans
+ #
false laziness w/flat.pm
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
'type' => 'select',
'select_options' => \%temporalities,
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
'type' => 'select',
'select_options' => \%temporalities,
@@
-80,7
+80,7
@@
tie my %temporalities, 'Tie::IxHash',
# 'type' => 'checkbox',
# },
# 'type' => 'checkbox',
# },
- 'international_prefix' => { 'name' => 'Destination prefix
for international CDR records
',
+ 'international_prefix' => { 'name' => 'Destination prefix
(es) for international CDR records. Separate multiple options with commas.
',
'default' => '011',
},
'default' => '011',
},
@@
-169,7
+169,7
@@
sub calc_recur {
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
- if $self->option('recur_temporality') eq 'preceding' && $last_bill == 0;
+ if $self->option('recur_temporality'
, 1
) eq 'preceding' && $last_bill == 0;
my $ratenum = $cust_pkg->part_pkg->option('ratenum');
my $ratenum = $cust_pkg->part_pkg->option('ratenum');
@@
-277,13
+277,23
@@
sub calc_recur {
# $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
my $intl = $self->option('international_prefix') || '011';
# $dest =~ s/\@(.*)$// and $siphost = $1; # @10.54.32.1, @sip.example.com
my $intl = $self->option('international_prefix') || '011';
+ my @intl = ();
+ if ( $intl =~ /,/ ) {
+ @intl = split(/\s*,\s*/, $intl);
+ } else {
+ @intl = ($intl);
+ }
#determine the country code
#determine the country code
+ my $intl_match = 0;
+ foreach my $i (@intl) {
+ if ( $number =~ /^$i(((\d)(\d))(\d))(\d+)$/ ) {
+ $intl_match++;
+ last;
+ }
+ }
my $countrycode;
my $countrycode;
- if ( $number =~ /^$intl(((\d)(\d))(\d))(\d+)$/
- || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/
- )
- {
+ if ( $intl_match || $number =~ /^\+(((\d)(\d))(\d))(\d+)$/ ) {
my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
#first look for 1 digit country code
my( $three, $two, $one, $u1, $u2, $rest ) = ( $1,$2,$3,$4,$5,$6 );
#first look for 1 digit country code