[freeside-commits] branch master updated. e2d752f1e348d0903888aa85f46d6288e282d6c6

[Ivan]

The branch, master has been updated
       via  e2d752f1e348d0903888aa85f46d6288e282d6c6 (commit)
      from  3ed189ae0f3d1a6fd082fe8d53d888dc4cd57ad2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e2d752f1e348d0903888aa85f46d6288e282d6c6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Jun 28 23:40:24 2014 -0700

    new zealand toll-free, RT#29638

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index bb12ca5..41b6d24 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 cced0eb..cd14165 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;

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm |    1 +
 FS/FS/cdr.pm  |    2 ++
 2 files changed, 3 insertions(+)