X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fglobalpops_voip.pm;h=e256d6a40904d51ebbf37d2cec0b5f6e7d4dc98d;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=4213bd1d192a3ebe74f36f25d4beb6c6a773694e;hpb=8a7aeda3fe2c178b0c492401adc6bf6afe47ec67;p=freeside.git

diff --git a/FS/FS/part_export/globalpops_voip.pm b/FS/FS/part_export/globalpops_voip.pm
index 4213bd1d1..e256d6a40 100644
--- a/FS/FS/part_export/globalpops_voip.pm
+++ b/FS/FS/part_export/globalpops_voip.pm
@@ -9,14 +9,15 @@ use FS::phone_avail;
 @ISA = qw(FS::part_export);
 
 tie my %options, 'Tie::IxHash',
-  'login'         => { label=>'GlobalPOPs Media Services API login' },
-  'password'      => { label=>'GlobalPOPs Media Services API password' },
-  'endpointgroup' => { label=>'GlobalPOPs endpoint group number' },
+  'login'         => { label=>'VoIP Innovations API login' },
+  'password'      => { label=>'VoIP Innovations API password' },
+  'endpointgroup' => { label=>'VoIP Innovations endpoint group number' },
+  'dry_run'       => { label=>"Test mode - don't actually provision" },
 ;
 
 %info = (
   'svc'     => 'svc_phone',
-  'desc'    => 'Provision phone numbers to GlobalPOPs VoIP',
+  'desc'    => 'Provision phone numbers to VoIP Innovations (formerly GlobalPOPs VoIP)',
   'options' => \%options,
   'notes'   => <<'END'
 Requires installation of
@@ -31,7 +32,7 @@ sub get_dids {
   my $self = shift;
   my %opt = ref($_[0]) ? %{$_[0]} : @_;
 
-  my %search = ();
+  my %getdids = ();
   #  'orderby' => 'npa', #but it doesn't seem to work :/
 
   if ( $opt{'areacode'} && $opt{'exchange'} ) { #return numbers
@@ -68,7 +69,7 @@ sub get_dids {
   if ( $search->{'statuscode'} == 302200 ) {
     return [];
   } elsif ( $search->{'statuscode'} != 100 ) {
-    die "Error running globalpop getDIDs: ".
+    die "Error running VoIP Innovations getDIDs: ".
         $search->{'statuscode'}. ': '. $search->{'status'}; #die??
   }
 
@@ -93,7 +94,7 @@ sub get_dids {
     my $lata_dids = $self->gp_command('getDIDs', %getdids, 'lata'=>$lata);
     my $lata_search = $lata_dids->{'search'};
     unless ( $lata_search->{'statuscode'} == 100 ) {
-      die "Error running globalpop getDIDs: ". $lata_search->{'status'}; #die??
+      die "Error running VoIP Innovations getDIDs: ". $lata_search->{'status'}; #die??
     }
    
     my $l = $lata_search->{state}{lata}{'rate_center'};
@@ -140,16 +141,18 @@ sub get_dids {
 
             my $tn = $npa->{nxx}{tn} || $npa->{nxx}{$opt{'exchange'}}{tn};
 
-            my @tn = ref($tn) ? @$tn : ($tn);
+            my @tn = ref($tn) eq 'ARRAY' ? @$tn : ($tn);
             #push @return, @tn;
-            push @return, map {
-                                if ( /^\s*(\d{3})(\d{3})(\d{4})\s*$/ ) {
-                                  "$1-$2-$3";
-                                } else {
-                                  $_;
-                                }
-                              }
-                              @tn;
+            push @return,
+              map {
+                    if ( /^\s*(\d{3})(\d{3})(\d{4})\s*$/ ) {
+                      "$1-$2-$3";
+                    } else {
+                      $_;
+                    }
+                  }
+               map { ref($_) eq 'HASH' ? $_->{'content'} : $_ } #tier always 2?
+               @tn;
 
           } elsif ( $opt{'areacode'} ) { #return city (npa-nxx-XXXX)
 
@@ -253,6 +256,9 @@ sub gp_command {
 
 sub _export_insert {
   my( $self, $svc_phone ) = (shift, shift);
+
+  return '' if $self->option('dry_run');
+
   #we want to provision and catch errors now, not queue
 
   my $r = $self->gp_command('reserveDID',
@@ -264,7 +270,7 @@ sub _export_insert {
   my $rdid = $r->{did};
 
   if ( $rdid->{'statuscode'} != 100 ) {
-    return "Error running globalpop reserveDID: ".
+    return "Error running VoIP Innovations reserveDID: ".
            $rdid->{'statuscode'}. ': '. $rdid->{'status'};
   }
 
@@ -278,7 +284,7 @@ sub _export_insert {
   my $adid = $a->{did};
 
   if ( $adid->{'statuscode'} != 100 ) {
-    return "Error running globalpop assignDID: ".
+    return "Error running VoIP Innovations assignDID: ".
            $adid->{'statuscode'}. ': '. $adid->{'status'};
   }
 
@@ -295,6 +301,8 @@ sub _export_replace {
 sub _export_delete {
   my( $self, $svc_phone ) = (shift, shift);
 
+  return '' if $self->option('dry_run');
+
   #probably okay to queue the deletion...?
   #but hell, let's do it inline anyway, who wants phone numbers hanging around
 
@@ -305,7 +313,7 @@ sub _export_delete {
   my $rdid = $r->{did};
 
   if ( $rdid->{'statuscode'} != 100 ) {
-    return "Error running globalpop releaseDID: ".
+    return "Error running VoIP Innovations releaseDID: ".
            $rdid->{'statuscode'}. ': '. $rdid->{'status'};
   }
 
@@ -325,20 +333,19 @@ sub _export_unsuspend {
 }
 
 #hmm, might forgo queueing entirely for most things, data is too much of a pita
-
-sub globalpops_voip_queue {
-  my( $self, $svcnum, $method ) = (shift, shift, shift);
-  my $queue = new FS::queue {
-    'svcnum' => $svcnum,
-    'job'    => 'FS::part_export::globalpops_voip::globalpops_voip_command',
-  };
-  $queue->insert(
-    $self->option('login'),
-    $self->option('password'),
-    $method,
-    @_,
-  );
-}
+#sub globalpops_voip_queue {
+#  my( $self, $svcnum, $method ) = (shift, shift, shift);
+#  my $queue = new FS::queue {
+#    'svcnum' => $svcnum,
+#    'job'    => 'FS::part_export::globalpops_voip::globalpops_voip_command',
+#  };
+#  $queue->insert(
+#    $self->option('login'),
+#    $self->option('password'),
+#    $method,
+#    @_,
+#  );
+#}
 
 sub globalpops_voip_command {
   my($login, $password, $method, @args) = @_;