X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fvitelity.pm;h=29ed8b6a1f312ba58b9ffe6ea2ea702e62cdf961;hb=00cd6dc7e1f767476d449a9180d44e6a6d042284;hp=22f9ba7d7d2a1f2715dada8cc1e518612303c748;hpb=e9f2cb50f9508ef790e5a37ffe68b2bcecc68930;p=freeside.git

diff --git a/FS/FS/part_export/vitelity.pm b/FS/FS/part_export/vitelity.pm
index 22f9ba7d7..29ed8b6a1 100644
--- a/FS/FS/part_export/vitelity.pm
+++ b/FS/FS/part_export/vitelity.pm
@@ -4,6 +4,7 @@ use base qw( FS::part_export );
 use vars qw( %info );
 use Tie::IxHash;
 use Geo::StreetAddress::US;
+use Net::Vitelity 0.05;
 use FS::Record qw( qsearch dbh );
 use FS::phone_avail;
 use FS::svc_phone;
@@ -24,6 +25,10 @@ tie my %options, 'Tie::IxHash',
   'disable_e911'       => { label => "Disable E911 provisioning",
                             type  => 'checkbox',
                           },
+  'debug'              => { label  => 'Enable debugging',
+                             type  => 'checkbox',
+                             value => 1,
+                          },
 ;
 
 %info = (
@@ -32,10 +37,6 @@ tie my %options, 'Tie::IxHash',
   'options'    => \%options,
   'no_machine' => 1,
   'notes'      => <<'END'
-Requires installation of
-<a href="http://search.cpan.org/dist/Net-Vitelity">Net::Vitelity</a>
-from CPAN.
-<br><br>
 routesip - optional Vitelity sub-account to which newly ordered DIDs will be routed
 <br>type - optional DID type (perminute, unlimited, or your-pri)
 END
@@ -60,7 +61,7 @@ sub get_dids {
     return [] if ( $tollfree[0] eq 'noneavailable' || $tollfree[0] eq 'none');
 
     foreach my $did ( @tollfree ) {
-        $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable did $did\n";
+        $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable toll-free did $did\n";
         push @ret, $did;
     }
 
@@ -100,7 +101,7 @@ sub get_dids {
     die "missingdata error running Vitelity API" if $dids[0] eq 'missingdata';
 
     foreach my $did ( @dids ) {
-      $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable did $did\n";
+      $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable (state and ratecenter) did $did\n";
       my($npa, $nxx, $station) = ($1, $2, $3);
 
       my $phone_avail = new FS::phone_avail {
@@ -210,7 +211,7 @@ sub get_dids {
       }
 
       foreach my $did ( @dids ) {
-        $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable did $did\n";
+        $did =~ /^(\d{3})(\d{3})(\d{4})/ or die "unparsable (state) did $did\n";
         my($npa, $nxx, $station) = ($1, $2, $3);
         $npa{$npa}++;
 
@@ -248,14 +249,11 @@ sub get_dids {
 sub vitelity_command {
   my( $self, $command, @args ) = @_;
 
-  eval "use Net::Vitelity;";
-  die $@ if $@;
-
   my $vitelity = Net::Vitelity->new(
-    'login' => $self->option('login'),
-    'pass'  => $self->option('pass'),
-    'apitype' => $self->option('fax') ? 'fax' : 'api',
-    #'debug'    => $debug,
+    'login'    => $self->option('login'),
+    'pass'     => $self->option('pass'),
+    'apitype'  => $self->option('fax') ? 'fax' : 'api',
+    'debug'    => $self->option('debug'),
   );
 
   $vitelity->$command(@args);
@@ -264,14 +262,11 @@ sub vitelity_command {
 sub vitelity_lnp_command {
   my( $self, $command, @args ) = @_;
 
-  eval "use Net::Vitelity 0.04;";
-  die $@ if $@;
-
   my $vitelity = Net::Vitelity->new(
-    'login'   => $self->option('login'),
-    'pass'    => $self->option('pass'),
-    'apitype' => 'lnp',
-    #'debug'   => $debug,
+    'login'    => $self->option('login'),
+    'pass'     => $self->option('pass'),
+    'apitype'  => 'lnp',
+    'debug'    => $self->option('debug'),
   );
 
   $vitelity->$command(@args);
@@ -287,6 +282,20 @@ sub _export_insert {
   #porting a number in?  different code path
   if ( $svc_phone->lnp_status eq 'portingin' ) {
 
+    my $cust_main = $svc_phone->cust_svc->cust_pkg->cust_main;
+
+    return 'Customer company is required'
+      unless $cust_main->company;
+
+    return 'Customer day phone (for contact, not porting) is required'
+      unless $cust_main->daytime;
+
+    return 'LNP Other Provider is required'
+      unless $svc_phone->lnp_other_provider;
+
+    return 'LNP Other Provider Account # is required'
+      unless $svc_phone->lnp_other_provider_account;
+
     my %location = $svc_phone->location_hash;
     my $sa = Geo::StreetAddress::US->parse_location( $location{'address1'} );
 
@@ -295,7 +304,7 @@ sub _export_insert {
       'partial'       => 'no',
       'wireless'      => 'no',
       'carrier'       => $svc_phone->lnp_other_provider,
-      'company'       => $svc_phone->cust_svc->cust_pkg->cust_main->company,
+      'company'       => $cust_main->company,
       'accnumber'     => $svc_phone->lnp_other_provider_account,
       'name'          => $svc_phone->phone_name_or_cust,
       'streetnumber'  => $sa->{number},
@@ -310,7 +319,7 @@ sub _export_insert {
       'state'         => $location{'state'},
       'zip'           => $location{'zip'},
       'billnumber'    => $svc_phone->phonenum, #?? do we need a new field for this?
-      'contactnumber' => $svc_phone->cust_svc->cust_pkg->cust_main->daytime,
+      'contactnumber' => $cust_main->daytime,
     );
 
     if ( $result =~ /^ok:/i ) {
@@ -474,7 +483,10 @@ sub _export_unsuspend {
 sub check_lnp {
   my $self = shift;
 
-  my $in_svcpart = 'IN ('. join( ',', map $_->svcpart, $self->export_svc). ')';
+  my @export_svc = $self->export_svc;
+  return unless @export_svc;
+
+  my $in_svcpart = 'IN ('. join( ',', map $_->svcpart, @export_svc). ')';
 
   foreach my $svc_phone (
     qsearch({ 'table'     => 'svc_phone',