From 0238fd7aa7a92887970507346ac7e6ad8ed5492c Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremyd@freeside.biz>
Date: Mon, 9 Feb 2015 18:05:07 -0600
Subject: API Customer Update

---
 FS/FS/API.pm           | 13 +++++++++----
 FS/FS/cust_main/API.pm | 29 ++++++++++++++---------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/FS/FS/API.pm b/FS/FS/API.pm
index 5b56539ad..dd172c143 100644
--- a/FS/FS/API.pm
+++ b/FS/FS/API.pm
@@ -430,8 +430,10 @@ sub new_customer {
 }
 
 =item update_customer
-Updates an existing customer. Passing an empty value clears that field, while NOT passing that key/value at all leaves it alone.
-Takes a hash reference as parameter with the following keys:
+
+Updates an existing customer. Passing an empty value clears that field, while
+NOT passing that key/value at all leaves it alone. Takes a list of keys and
+values as parameters with the following keys:
 
 =over 4
 
@@ -497,7 +499,9 @@ Mobile number
 
 =item invoicing_list
 
-comma-separated list of email addresses for email invoices. The special value '$
+Comma-separated list of email addresses for email invoices. The special value 
+'POST' is used to designate postal invoicing (it may be specified alone or in
+addition to email addresses),
 postal_invoicing
 Set to 1 to enable postal invoicing
 
@@ -507,7 +511,8 @@ CARD, DCRD, CHEK, DCHK, LECB, BILL, COMP or PREPAY
 
 =item payinfo
 
-Card number for CARD/DCRD, account_number@aba_number for CHEK/DCHK, prepaid "pi$
+Card number for CARD/DCRD, account_number@aba_number for CHEK/DCHK, prepaid 
+"pin" for PREPAY, purchase order number for BILL
 
 =item paycvv
 
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;
 
-- 
cgit v1.2.1


From d422d2530bda9de3af830f1e1ab1084061b486f5 Mon Sep 17 00:00:00 2001
From: Alex Brelsfoard <alex@freeside.biz>
Date: Tue, 10 Feb 2015 00:10:00 -0500
Subject: RT #29285 adding new config to disable city requirement

---
 FS/FS/Conf.pm                     | 8 ++++++++
 httemplate/elements/location.html | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 029f1a1bf..9ba3f0983 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3351,6 +3351,14 @@ and customer address. Include units.',
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'city_not_required',
+    'section'     => 'required',
+    'description' => 'Turn off requirement for a City to be entered for billing & shipping addresses',
+    'type'        => 'checkbox',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 214a7d5f2..357a91db7 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -169,10 +169,15 @@ Example:
 
 
 <TR>
+% if ($conf->exists('city_not_required')) {
+<input type="hidden" name="<% ($select_hash{'prefix'}) ? $select_hash{'prefix'} : '' %>city" value=" "/>
+%} else {
   <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %></<%$th%>>
   <TD WIDTH="1"><% include('/elements/city.html', %select_hash, 'text_style' => \@style ) %></TD>
+
   <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
   <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD>
+% }
   <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %></<%$th%>>
   <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
-- 
cgit v1.2.1