[freeside-commits] branch FREESIDE_3_BRANCH updated. 98af9a2e3abbc0cabe58514500eeec5f17284ef8

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  98af9a2e3abbc0cabe58514500eeec5f17284ef8 (commit)
      from  a7a669aa8b959519fe5fa088c7efe05eadbcc845 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 98af9a2e3abbc0cabe58514500eeec5f17284ef8
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jan 29 17:43:25 2019 -0500

    RT# 78356 - cleaned up error message display

diff --git a/FS/FS/part_export/saisei.pm b/FS/FS/part_export/saisei.pm
index 56c61187b..ce80f5e9f 100644
--- a/FS/FS/part_export/saisei.pm
+++ b/FS/FS/part_export/saisei.pm
@@ -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;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/saisei.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)