X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fgeocode_Mixin.pm;h=c1b9f865b7cde9f3b4d31c145cf8a5c519c4dd26;hb=72deba42ac5847c2a6bdeea20157035b8f9df7ae;hp=a17a0abed2d071da035aa52d439920098e39b290;hpb=f0f1d277947922b81bcc4d77971a43ed125d72f5;p=freeside.git

diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index a17a0abed..c1b9f865b 100644
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -96,7 +96,8 @@ sub location_label {
     $notfirst++;
   }
 
-  if ( $self->get($prefix.'location_type') ) {
+  my $lt = $self->get($prefix.'location_type');
+  if ( $lt ) {
     my %location_type;
     if ( 1 ) { #ikano, switch on via config
       { no warnings 'void';
@@ -108,9 +109,7 @@ sub location_label {
       %location_type = (); #?
     }
 
-    $line .= ' '.&$escape( $location_type{ $self->get($prefix.'location_type') }
-                                       ||  $self->get($prefix.'location_type')
-                         );
+    $line .= ' '.&$escape( $location_type{$lt} || $lt );
   }
 
   $line .= ' '. &$escape($self->get($prefix.'location_number'))
@@ -156,7 +155,8 @@ sub geocode {
   $zip ||= '';
   $plus4 ||= '';
   #CCH specific location stuff
-  my $extra_sql = "AND plus4lo <= '$plus4' AND plus4hi >= '$plus4'";
+  my $extra_sql = $plus4 ? "AND plus4lo <= '$plus4' AND plus4hi >= '$plus4'"
+                         : '';
 
   my @cust_tax_location =
     qsearch( {
@@ -169,50 +169,12 @@ sub geocode {
   $geocode = $cust_tax_location[0]->geocode
     if scalar(@cust_tax_location);
 
-  $geocode;
-}
-
-=item alternize
-
-Attempts to parse data for location_type and location_number from address1
-and address2.
-
-=cut
-
-sub alternize {
-  my $self = shift;
-  my $prefix = $self->has_ship_address ? 'ship_' : '';
+  warn "WARNING: customer ". $self->custnum.
+       ": multiple locations for zip ". $self->get("${prefix}zip").
+       "; using arbitrary geocode $geocode\n"
+    if scalar(@cust_tax_location) > 1;
 
-  return '' if $self->get($prefix.'location_type')
-            || $self->get($prefix.'location_number');
-
-  my %parse;
-  if ( 1 ) { #ikano, switch on via config
-    { no warnings 'void';
-      eval { 'use FS::part_export::ikano;' };
-      die $@ if $@;
-    }
-    %parse = FS::part_export::ikano->location_types_parse;
-  } else {
-    %parse = (); #?
-  }
-
-  foreach my $from ('address1', 'address2') {
-    foreach my $parse ( keys %parse ) {
-      my $value = $self->get($prefix.$from);
-      if ( $value =~ s/(^|\W+)$parse\W+(\w+)\W*$//i ) {
-        $self->set($prefix.'location_type', $parse{$parse});
-        $self->set($prefix.'location_number', $2);
-        $self->set($prefix.$from, $value);
-        return '';
-      }
-    }
-  }
-
-  #nothing matched, no changes
-  $self->get($prefix.'address2')
-    ? "Can't parse unit type and number from ${prefix}address2"
-    : '';
+  $geocode;
 }
 
 =back