qualification address handling changes, RT#7111

diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index 498b7cf..a17a0ab 100644 (file)
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -96,19 +96,23 @@ sub location_label {
     $notfirst++;
   }
 
     $notfirst++;
   }
 

-  my %location_type;
-  if ( 1 ) { #ikano, switch on via config
-    { no warnings 'void';
-      eval { 'use FS::part_export::ikano;' };
-      die $@ if $@;
+  if ( $self->get($prefix.'location_type') ) {
+    my %location_type;
+    if ( 1 ) { #ikano, switch on via config
+      { no warnings 'void';
+        eval { 'use FS::part_export::ikano;' };
+        die $@ if $@;
+      }
+      %location_type = FS::part_export::ikano->location_types;
+    } else {
+      %location_type = (); #?

     }
     }

-    %location_type = FS::part_export::ikano->location_types;
-  } else {
-    %location_type = (); #?
+
+    $line .= ' '.&$escape( $location_type{ $self->get($prefix.'location_type') }
+                                       ||  $self->get($prefix.'location_type')
+                         );

   }
 
   }
 

-  $line .= ' '. &$escape( $location_type{ $self->get($prefix.'location_type') })
-    if $self->get($prefix.'location_type');

   $line .= ' '. &$escape($self->get($prefix.'location_number'))
     if $self->get($prefix.'location_number');
 
   $line .= ' '. &$escape($self->get($prefix.'location_number'))
     if $self->get($prefix.'location_number');
 

diff --git a/FS/FS/part_export/ikano.pm b/FS/FS/part_export/ikano.pm
index b04defa..303952c 100644 (file)
--- a/FS/FS/part_export/ikano.pm
+++ b/FS/FS/part_export/ikano.pm
@@ -292,7 +292,6 @@ sub qual {
     my %location_hash = $qual->location_hash; 
     return 'No address provided' unless keys %location_hash;
 
     my %location_hash = $qual->location_hash; 
     return 'No address provided' unless keys %location_hash;
 

-    warn Dumper(\%location_hash);

     return 'Location kind is required' unless $location_hash{location_kind};
 
     my $svctn = $qual->phonenum;
     return 'Location kind is required' unless $location_hash{location_kind};
 
     my $svctn = $qual->phonenum;