X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fvoip_innovations3.pm;h=3c76899223a594dee8f86ebb0eb349cb3a5c15f6;hb=ffa18709ee8a4d05e18d2d406cf73afe79e52524;hp=630d0c41fbd9011a79e986f0fb0c9a81b29067c0;hpb=649606c0123e1c21b9b054abf63b2933d41df2cc;p=freeside.git

diff --git a/FS/FS/part_export/voip_innovations3.pm b/FS/FS/part_export/voip_innovations3.pm
index 630d0c41f..3c7689922 100644
--- a/FS/FS/part_export/voip_innovations3.pm
+++ b/FS/FS/part_export/voip_innovations3.pm
@@ -16,11 +16,16 @@ tie my %options, 'Tie::IxHash',
   'e911'          => { label=>'Provision E911 data',
                        type=>'checkbox',
                      },
-  'no_did_provision' => { label=>'Disable DID provisioning',
-                       type=>'checkbox',
-                     },
-  'dry_run'       => { label=>"Test mode - don't actually provision",
-                       type=>'checkbox',
+  'no_provision_did' => { label=>'Disable DID provisioning',
+                          type=>'checkbox',
+                        },
+#not particularly useful unless we can_get_dids
+#  'dry_run'       => { label=>"Test mode - don't actually provision",
+#                       type=>'checkbox',
+#                     },
+  'sandbox'       => { label=>'Communicatino with the VoIP Innovations sandbox'.
+                              ' instead of the live server',
+                       type => 'checkbox',
                      },
 ;
 
@@ -49,13 +54,13 @@ sub vi_command {
     die $@;
   }
 
-  my $gp = Net::VoIP_Innovations->new(
+  my $vi = Net::VoIP_Innovations->new(
     'login'    => $self->option('login'),
     'password' => $self->option('password'),
-    #'debug'    => $debug,
+    'sandbox'  => $self->option('sandbox'),
   );
 
-  $gp->$command(@args);
+  $vi->$command(@args);
 }
 
 
@@ -68,6 +73,8 @@ sub _export_insert {
 
   unless ( $self->option('no_provision_did') ) {
 
+    return "can't yet provision to VoIP Innovations v3 API"; #XXX
+
     ###
     # reserveDID
     ###
@@ -106,31 +113,29 @@ sub _export_insert {
   }
 
   ###
-  # 911Insert
+  # insert911
   ###
 
   if ( $self->option('e911') ) {
 
     my %location_hash = $svc_phone->location_hash;
     my( $zip, $plus4 ) = split('-', $location_hash->{zip});
-    my $e = $self->vi_command('911Insert',
+    my $resp = $self->vi_command('insert911',
       'did'        => $svc_phone->phonenum,
-      'Address1'   => $location_hash{address1},
-      'Address2'   => $location_hash{address2},
-      'City'       => $location_hash{city},
-      'State'      => $location_hash{state},
-      'ZipCode'    => $zip,
-      'PlusFour'   => $plus4,
-      'CallerName' =>
+      'address1'   => $location_hash{address1},
+      'address2'   => $location_hash{address2},
+      'city'       => $location_hash{city},
+      'state'      => $location_hash{state},
+      'zip'        => $zip,
+      'plusFour'   => $plus4,
+      'callerName' =>
         $svc_phone->phone_name
           || $svc_phone->cust_svc->cust_pkg->cust_main->contact_firstlast,
     );
 
-    my $edid = $e->{did};
-
-    if ( $edid->{'statuscode'} != 100 ) {
-      return "Error running VoIP Innovations 911Insert: ".
-             $edid->{'statuscode'}. ': '. $edid->{'status'};
+    if ( $resp->{'responseCode'} != 100 ) {
+      return "Error running VoIP Innovations insert911: ".
+             $resp->{'responseCode'}. ': '. $resp->{'responseMessage'};
     }
 
   }
@@ -149,26 +154,24 @@ sub _export_replace {
 
   if ( $self->option('e911') ) {
 
-    my %location_hash = $svc_phone->location_hash;
+    my %location_hash = $new->location_hash;
     my( $zip, $plus4 ) = split('-', $location_hash->{zip});
-    my $e = $self->vi_command('911Update',
+    my $resp = $self->vi_command('update911',
       'did'        => $svc_phone->phonenum,
-      'Address1'   => $location_hash{address1},
-      'Address2'   => $location_hash{address2},
-      'City'       => $location_hash{city},
-      'State'      => $location_hash{state},
-      'ZipCode'    => $zip,
-      'PlusFour'   => $plus4,
-      'CallerName' =>
+      'address1'   => $location_hash{address1},
+      'address2'   => $location_hash{address2},
+      'city'       => $location_hash{city},
+      'state'      => $location_hash{state},
+      'zip'        => $zip,
+      'plusFour'   => $plus4,
+      'callerName' =>
         $svc_phone->phone_name
           || $svc_phone->cust_svc->cust_pkg->cust_main->contact_firstlast,
     );
 
-    my $edid = $e->{did};
-
-    if ( $edid->{'statuscode'} != 100 ) {
-      return "Error running VoIP Innovations 911Update: ".
-             $edid->{'statuscode'}. ': '. $edid->{'status'};
+    if ( $resp->{'responseCode'} != 100 ) {
+      return "Error running VoIP Innovations update911: ".
+             $resp->{'responseCode'}. ': '. $resp->{'responseMessage'};
     }
 
   }
@@ -179,24 +182,48 @@ sub _export_replace {
 sub _export_delete {
   my( $self, $svc_phone ) = (shift, shift);
 
-  return '' if $self->option('dry_run')
-            || $self->option('no_provision_did');
+  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
+  ###
+  # releaseDID
+  ###
 
-  my $r = $self->vi_command('releaseDID',
-    'did'           => $svc_phone->phonenum,
-  );
+  unless ( $self->option('no_provision_did') ) {
+
+    return "can't yet provision to VoIP Innovations v3 API"; #XXX
 
-  my $rdid = $r->{did};
+    #probably okay to queue the deletion...?
+    #but hell, let's do it inline anyway, who wants phone numbers hanging around
+
+    my $r = $self->vi_command('releaseDID',
+      'did'           => $svc_phone->phonenum,
+    );
+
+    my $rdid = $r->{did};
+
+    if ( $rdid->{'statuscode'} != 100 ) {
+      return "Error running VoIP Innovations releaseDID: ".
+             $rdid->{'statuscode'}. ': '. $rdid->{'status'};
+    }
 
-  if ( $rdid->{'statuscode'} != 100 ) {
-    return "Error running VoIP Innovations releaseDID: ".
-           $rdid->{'statuscode'}. ': '. $rdid->{'status'};
   }
 
-  #delete e911 information?  assuming release clears all that
+  ###
+  # remove911
+  ###
+
+  if ( $self->option('e911') ) {
+
+    my $resp = $self->vi_command('remove911',
+      'did'        => $svc_phone->phonenum,
+    );
+
+    if ( $resp->{'responseCode'} != 100 ) {
+      return "Error running VoIP Innovations remove911: ".
+             $resp->{'responseCode'}. ': '. $resp->{'responseMessage'};
+    }
+
+  }
 
   '';
 }