X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fphone_avail.pm;h=ae8526c3d2a60300c2f998cf80e1960cd510818b;hp=3066ac0334b15fb79fefee1fe9edfbde2a8c1406;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hpb=31f2e890b5b3e1b0ad29a877ff67bc641ea1fc40

diff --git a/FS/FS/phone_avail.pm b/FS/FS/phone_avail.pm
index 3066ac033..ae8526c3d 100644
--- a/FS/FS/phone_avail.pm
+++ b/FS/FS/phone_avail.pm
@@ -1,12 +1,12 @@
 package FS::phone_avail;
+use base qw( FS::cust_main_Mixin FS::Record );
 
 use strict;
-use vars qw( @ISA $DEBUG $me );
+use vars qw( $DEBUG $me );
+use FS::Misc::DateTime qw( parse_datetime );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::cust_svc;
-use FS::Misc::DateTime qw( parse_datetime );
-
-@ISA = qw(FS::cust_main_Mixin FS::Record);
+use FS::msa;
 
 $me = '[FS::phone_avail]';
 $DEBUG = 0;
@@ -70,13 +70,17 @@ station
 
 Optional name
 
-=item svcnum
+=item rate_center_abbrev - abbreviated rate center
 
-svcnum
+=item latanum - LATA #
 
-=item availbatch
+=item msanum - MSA #
+
+=item ordernum - bulk DID order #
 
-availbatch
+=item svcnum
+
+=item availbatch
 
 =back
 
@@ -145,11 +149,13 @@ sub check {
     || $self->ut_number('npa')
     || $self->ut_numbern('nxx')
     || $self->ut_numbern('station')
-    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
-    || $self->ut_foreign_keyn('ordernum', 'did_order', 'ordernum' )
-    || $self->ut_textn('availbatch')
     || $self->ut_textn('name')
     || $self->ut_textn('rate_center_abbrev')
+    || $self->ut_foreign_keyn('latanum', 'lata', 'latanum' )
+    || $self->ut_foreign_keyn('msanum', 'msa', 'msanum' )
+    || $self->ut_foreign_keyn('ordernum', 'did_order', 'ordernum' )
+    || $self->ut_foreign_keyn('svcnum', 'cust_svc', 'svcnum' )
+    || $self->ut_textn('availbatch')
   ;
   return $error if $error;
 
@@ -168,14 +174,46 @@ sub cust_svc {
 
 =item part_export
 
+=item lata 
+
+=item msa2msanum
+
+Translate free-form MSA name to a msa.msanum
+
 =cut
 
-sub part_export {
-  my $self = shift;
-  return '' unless $self->exportnum;
-  qsearchs('part_export', { 'exportnum' => $self->exportnum });
+sub msa2msanum {
+    my $self = shift;
+    my $msa = shift;
+
+    if ( $msa =~ /(.+[^,])\s+(\w{2}(-\w{2})*)$/ ) {
+      $msa = "$1, $2";
+    }
+
+    my @msas = qsearch('msa', { 'description' => { 'op' => 'ILIKE',
+                                                   'value' => "%$msa%", }
+                              });
+    return 0 unless scalar(@msas);
+    my @msa = grep { $self->msatest($msa,$_->description) } @msas;
+    return 0 unless scalar(@msa) == 1;
+    $msa[0]->msanum;
 }
 
+sub msatest {
+    my $self = shift;
+    my ($their,$our) = (shift,shift);
+
+    $their =~ s/^\s+//;
+    $their =~ s/\s+$//;
+    $their =~ s/\s+/ /g;
+    return 1 if $our eq $their;
+
+    my $a = $our;
+    $a =~ s/,.*?$//;
+    return 1 if $a eq $their;
+    return 1 if ($our =~ /^([\w\s]+)-/ && $1 eq $their);
+    0;
+}
 
 sub process_batch_import {
   my $job = shift;
@@ -190,40 +228,47 @@ sub process_batch_import {
     $phone_avail->station($3);
   };
 
+  my $msasub = sub {
+    my( $phone_avail, $value ) = @_;
+    return '' if !$value;
+    my $msanum = $phone_avail->msa2msanum($value);
+    die "cannot translate MSA ($value) to msanum" unless $msanum;
+    $phone_avail->msanum($msanum);
+  };
+
   my $opt = { 'table'   => 'phone_avail',
               'params'  => [ 'availbatch', 'exportnum', 'countrycode', 'ordernum', 'vendor_order_id', 'confirmed' ],
               'formats' => { 'default' => [ 'state', $numsub, 'name' ],
-			     'bulk' => [ 'state', $numsub, 'name', 'rate_center_abbrev', 'msa', 'latanum' ],
-			   },
-	      'postinsert_callback' => sub {  
-		    my $record = shift;
-		    if($record->ordernum) {
-			my $did_order = qsearchs('did_order', 
-						{ 'ordernum' => $record->ordernum } );
-			if($did_order && !$did_order->received) {
-			    $did_order->received(time);
-			    $did_order->confirmed(parse_datetime($record->confirmed));
-			    $did_order->vendor_order_id($record->vendor_order_id);
-			    $did_order->replace;
-			}
-		    }
-		}, 
+                 'bulk' => [ 'state', $numsub, 'name', 'rate_center_abbrev', $msasub, 'latanum' ],
+               },
+               'postinsert_callback' => sub {  
+                    my $record = shift;
+                    if($record->ordernum) {
+                        my $did_order = qsearchs('did_order', 
+                                            { 'ordernum' => $record->ordernum } );
+                        if($did_order && !$did_order->received) {
+                            $did_order->received(time);
+                            $did_order->confirmed(parse_datetime($record->confirmed));
+                            $did_order->vendor_order_id($record->vendor_order_id);
+                            $did_order->replace;
+                        }
+                    }
+               }, 
             };
 
   FS::Record::process_batch_import( $job, $opt, @_ );
-
 }
 
 sub flush { # evil direct SQL
     my $opt = shift;
 
     if ( $opt->{'ratecenter'} =~ /^[\w\s]+$/
-	    && $opt->{'state'} =~ /^[A-Z][A-Z]$/ 
-	    && $opt->{'exportnum'} =~ /^\d+$/) {
-	my $sth = dbh->prepare('delete from phone_avail where exportnum = ? '.
-		    ' and state = ? and name = ?');
-	$sth->execute($opt->{'exportnum'},$opt->{'state'},$opt->{'ratecenter'})
-	    or die $sth->errstr;
+        && $opt->{'state'} =~ /^[A-Z][A-Z]$/ 
+        && $opt->{'exportnum'} =~ /^\d+$/) {
+    my $sth = dbh->prepare('delete from phone_avail where exportnum = ? '.
+            ' and state = ? and name = ?');
+    $sth->execute($opt->{'exportnum'},$opt->{'state'},$opt->{'ratecenter'})
+        or die $sth->errstr;
     }
 
     '';
@@ -238,8 +283,8 @@ sub _upgrade_data {
   my $sth = dbh->prepare(
     'UPDATE phone_avail SET svcnum = NULL
        WHERE svcnum IS NOT NULL
-         AND 0 = ( SELECT COUNT(*) FROM svc_phone
-                     WHERE phone_avail.svcnum = svc_phone.svcnum )'
+         AND NOT EXISTS ( SELECT 1 FROM svc_phone
+                            WHERE phone_avail.svcnum = svc_phone.svcnum )'
   ) or die dbh->errstr;
 
   $sth->execute or die $sth->errstr;