X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fnetsapiens.pm;h=c6110f5ac523623455b7ef71407fff7a76e42ea0;hp=2e37d04b667982e53c2912c514ba80f5d7699c29;hb=c955f8e33cf8270f37b2d07e3920a30be33dd14a;hpb=1ad547a47f16b4230762e752fbe48d460ed997e1

diff --git a/FS/FS/part_export/netsapiens.pm b/FS/FS/part_export/netsapiens.pm
index 2e37d04b6..c6110f5ac 100644
--- a/FS/FS/part_export/netsapiens.pm
+++ b/FS/FS/part_export/netsapiens.pm
@@ -1,13 +1,14 @@
 package FS::part_export::netsapiens;
+use base qw( FS::part_export );
 
-use vars qw(@ISA $me %info);
+use vars qw( $me %info );
 use MIME::Base64;
 use Tie::IxHash;
-use FS::part_export;
 use Date::Format qw( time2str );
-use Regexp::Common qw/URI/;
+use Regexp::Common qw( URI );
+use REST::Client;
+use Carp qw(carp);
 
-@ISA = qw(FS::part_export);
 $me = '[FS::part_export::netsapiens]';
 
 #These export options set default values for the various commands
@@ -72,14 +73,11 @@ tie my %options, 'Tie::IxHash',
 ;
 
 %info = (
-  'svc'        => [ 'svc_phone', ], # 'part_device',
+  'svc'        => [qw( svc_phone part_device )],
   'desc'       => 'Provision phone numbers to NetSapiens',
   'options'    => \%options,
   'no_machine' => 1,
   'notes'      => <<'END'
-Requires installation of
-<a href="http://search.cpan.org/dist/REST-Client">REST::Client</a>
-from CPAN.
 END
 );
 
@@ -118,8 +116,6 @@ sub _ns_command {
 
   # kludge to curb excessive paranoia in LWP 6.0+
   local $ENV{'PERL_LWP_SSL_VERIFY_HOSTNAME'} = 0;
-  eval 'use REST::Client';
-  die $@ if $@;
 
   my $ns = new REST::Client 'host'=>$self->option($prefix.'url');
 
@@ -397,6 +393,12 @@ sub _export_unsuspend {
 sub export_device_insert {
   my( $self, $svc_phone, $phone_device ) = (shift, shift, shift);
 
+  if ( $FS::svc_Common::noexport_hack ) {
+    carp 'export_device_insert() suppressed by noexport_hack'
+      if $self->option('debug');
+    return;
+  }
+
   my $domain = $self->ns_domain($svc_phone);
   my $countrycode = $svc_phone->countrycode;
   my $phonenum    = $svc_phone->phonenum;
@@ -431,6 +433,12 @@ sub export_device_insert {
 sub export_device_delete {
   my( $self, $svc_phone, $phone_device ) = (shift, shift, shift);
 
+  if ( $FS::svc_Common::noexport_hack ) {
+    carp 'export_device_delete() suppressed by noexport_hack'
+      if $self->option('debug');
+    return;
+  }
+
   my $ns = $self->ns_device_command(
     'DELETE', $self->ns_device($svc_phone, $phone_device),
   );