RT# 78356 - cleaned up error message display
authorChristopher Burger <burgerc@freeside.biz>
Tue, 29 Jan 2019 22:43:25 +0000 (17:43 -0500)
committerChristopher Burger <burgerc@freeside.biz>
Tue, 29 Jan 2019 22:55:08 +0000 (17:55 -0500)
FS/FS/part_export/saisei.pm

index 56c6118..ce80f5e 100644 (file)
@@ -348,7 +348,7 @@ sub export_tower_sector {
       return $sector_access_point if $sector_access_point->{error};
   }
 
-  return $self->api_error;
+  return { error => $self->api_error, };
 }
 
 ## creates the rateplan name
@@ -525,7 +525,7 @@ sub api_get_host {
 
   my $get_host = $self->api_call("GET", "/hosts/$ip");
 
-  return $self->api_error if $self->api_error;
+  return { message => $self->api_error, } if $self->api_error;
 
   return $get_host;
 }
@@ -807,6 +807,7 @@ sub process_tower {
 
   my $accesspoint = $self->api_get_accesspoint($tower_name);
 
+  return { error => $self->api_error, } if $self->api_error;
   return $accesspoint;
 }
 
@@ -845,6 +846,7 @@ sub process_sector {
   # set access point to existing one or newly created one.
   my $accesspoint = $existing_sector_ap ? $existing_sector_ap : $self->api_get_accesspoint($sector_name);
 
+  return { error => $self->api_error, } if $self->api_error;
   return $accesspoint;
 }