X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FAPI.pm;h=158b5cf58e6ef1db92ed6cf37cc22b953cd23a63;hp=cfdc2222ab0d2da2546e51252a3b06e19745891e;hb=0238fd7aa7a92887970507346ac7e6ad8ed5492c;hpb=16542dcb6b35c8cf7f436f87adb2cfdb0e32f4fc

diff --git a/FS/FS/cust_main/API.pm b/FS/FS/cust_main/API.pm
index cfdc2222a..158b5cf58 100644
--- a/FS/FS/cust_main/API.pm
+++ b/FS/FS/cust_main/API.pm
@@ -163,7 +163,6 @@ sub API_update {
 
   my $conf = new FS::Conf;
 
-
   my $custnum = $opt{'custnum'}
     or return { 'error' => "no customer record" };
 
@@ -180,11 +179,14 @@ sub API_update {
         payby payinfo paydate paycvv payname
       ),
 
-  my @invoicing_list = $opt{'invoicing_list'}
-                         ? split( /\s*\,\s*/, $opt{'invoicing_list'} )
-                         : $cust_main->invoicing_list;
-  push @invoicing_list, 'POST' if $opt{'postal_invoicing'};
- 
+  my @invoicing_list;
+  if ( exists $opt{'invoicing_list'} || exists $opt{'postal_invoicing'} ) {
+    @invoicing_list = split( /\s*\,\s*/, $opt{'invoicing_list'} );
+    push @invoicing_list, 'POST' if $opt{'postal_invoicing'};
+  } else {
+    @invoicing_list = $cust_main->invoicing_list;
+  }
+
   if ( exists( $opt{'address1'} ) ) {
     my $bill_location = FS::cust_location->new({
         map { $_ => $opt{$_} } @location_editable_fields
@@ -197,7 +199,7 @@ sub API_update {
     $new->set('bill_location' => $bill_location);
   }
 
-  if ( exists($opt{'ship_address1'}) ) {
+  if ( exists($opt{'ship_address1'}) && length($opt{"ship_address1"}) > 0 ) {
     my $ship_location = FS::cust_location->new({
         map { $_ => $opt{"ship_$_"} } @location_editable_fields
     });
@@ -206,16 +208,13 @@ sub API_update {
     my $error = $ship_location->find_or_insert;
     die $error if $error;
 
-   }
-
-   if ( !grep { length($opt{"ship_$_"}) } @location_editable_fields ) {
-      # Selfservice unfortunately tries to indicate "same as billing
-      # address" by sending all fields empty.  Did this ever work?
-
-      my $ship_location = $cust_main->bill_location;
-      $new->set('ship_location' => $ship_location);
+   $new->set('ship_location' => $ship_location);
 
+   } elsif (exists($opt{'ship_address1'} ) && !grep { length($opt{"ship_$_"}) } @location_editable_fields ) {
+      my $ship_location = $new->bill_location;
+     $new->set('ship_location' => $ship_location);
    }
+
   my $error = $new->replace( $cust_main, \@invoicing_list );
   return { 'error'   => $error } if $error;