X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fphone_avail.pm;h=ae8526c3d2a60300c2f998cf80e1960cd510818b;hp=b726d3497e819eb81a5381850eccf4a0c9701d88;hb=HEAD;hpb=0cdeb16dd536ac7e3d5ed8ab25da73311f0be870

diff --git a/FS/FS/phone_avail.pm b/FS/FS/phone_avail.pm
index b726d3497..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;
@@ -174,13 +174,7 @@ sub cust_svc {
 
 =item part_export
 
-=cut
-
-sub part_export {
-  my $self = shift;
-  return '' unless $self->exportnum;
-  qsearchs('part_export', { 'exportnum' => $self->exportnum });
-}
+=item lata 
 
 =item msa2msanum
 
@@ -191,11 +185,34 @@ Translate free-form MSA name to a msa.msanum
 sub msa2msanum {
     my $self = shift;
     my $msa = shift;
-    my $res = qsearchs('msa', { 'description' => { 'op' => 'ILIKE',
-                                                   'value' => $msa, }
+
+    if ( $msa =~ /(.+[^,])\s+(\w{2}(-\w{2})*)$/ ) {
+      $msa = "$1, $2";
+    }
+
+    my @msas = qsearch('msa', { 'description' => { 'op' => 'ILIKE',
+                                                   'value' => "%$msa%", }
                               });
-    return 0 unless $res;
-    $res->msanum;
+    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 {
@@ -213,6 +230,7 @@ sub process_batch_import {
 
   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);
@@ -226,14 +244,14 @@ sub process_batch_import {
                '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;
-                    }
+                        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;
+                        }
                     }
                }, 
             };
@@ -265,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;