From: Ivan Kohler <ivan@freeside.biz>
Date: Sun, 29 Jun 2014 06:40:26 +0000 (-0700)
Subject: new zealand toll-free, RT#29638
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f5a3514aa0c5b197a7c520205f8103da1363572a

new zealand toll-free, RT#29638
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 54a9ca392..fba20fa5f 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5755,6 +5755,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;