projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ed189a
)
new zealand toll-free, RT#29638
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 29 Jun 2014 06:40:24 +0000
(23:40 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 29 Jun 2014 06:40:24 +0000
(23:40 -0700)
FS/FS/Conf.pm
patch
|
blob
|
history
FS/FS/cdr.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
bb12ca5
..
41b6d24
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-5769,6
+5769,7
@@
and customer address. Include units.',
'type' => 'select',
'select_hash' => [ '' => 'NANPA (US/Canada)',
'AU' => 'Australia',
'type' => 'select',
'select_hash' => [ '' => 'NANPA (US/Canada)',
'AU' => 'Australia',
+ 'NZ' => 'New Zealand',
],
},
],
},
diff --git
a/FS/FS/cdr.pm
b/FS/FS/cdr.pm
index
cced0eb
..
cd14165
100644
(file)
--- a/
FS/FS/cdr.pm
+++ b/
FS/FS/cdr.pm
@@
-370,6
+370,8
@@
sub is_tollfree {
my $field = scalar(@_) ? shift : 'dst';
my $country = $conf->config('tollfree-country');
if ( $country eq 'AU' ) {
my $field = scalar(@_) ? shift : 'dst';
my $country = $conf->config('tollfree-country');
if ( $country eq 'AU' ) {
+ ( $self->$field() =~ /^(\+?61)?1800/ ) ? 1 : 0;
+ } elsif ( $country eq 'NZ' ) {
( $self->$field() =~ /^(\+?64)?(800|508)/ ) ? 1 : 0;
} else { #NANPA (US/Canaada)
( $self->$field() =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0;
( $self->$field() =~ /^(\+?64)?(800|508)/ ) ? 1 : 0;
} else { #NANPA (US/Canaada)
( $self->$field() =~ /^(\+?1)?8(8|([02-7])\3)/ ) ? 1 : 0;