diff options
| -rw-r--r-- | FS/FS/Conf.pm | 1 | ||||
| -rw-r--r-- | FS/FS/cdr.pm | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index bb12ca503..41b6d24ca 100644 --- 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', + 'NZ' => 'New Zealand', ], }, diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index cced0eb90..cd1416533 100644 --- 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' ) { + ( $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; |