From 8867f90b42a458bb548132507a45bfc9860c819c Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 8 Aug 2018 14:57:15 -0400
Subject: [PATCH] Fix the business_city field and default for business_state

update no default for state and was using wrong city
---
 classes/data/dataContacts.php  |  2 +-
 views/admin/contacts/edit.html | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/classes/data/dataContacts.php b/classes/data/dataContacts.php
index fd3e549..a9f320b 100644
--- a/classes/data/dataContacts.php
+++ b/classes/data/dataContacts.php
@@ -495,7 +495,7 @@ class GlmDataContacts extends GlmDataAbstract
                 'field' => 'business_state',
                 'type' => 'list',
                 'list' => $this->config['states'],
-                'default' => 'MI',
+                //'default' => 'MI',
                 'use' => 'a'
             ),
 
diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index a6136c7..81ed55b 100644
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -62,7 +62,7 @@
 
     {else} <!-- !$option -->
 
-    
+
     {if apply_filters('glm_members_permit_admin_member_contacts_edit_contact', true)}
 
     {if $option == 'create' || $option == 'edit'}
@@ -143,7 +143,7 @@
         </h2>
 
 
-            
+
             <div id="glm-table-profile" class="glm-admin-table-outer glm-contact-info-table glm-admin-table">
                 <div id="glm-contact-account-settings-toggle" class="glm-contact-content-toggle {if $contactEditOwnRecord}glm-hidden{/if}">
                     <h3 class="section-title">Account Settings</h3>
@@ -676,7 +676,7 @@
                                     <!-- City Selection -->
                                     <input id="businessCityName" type="hidden" name="newBusinessCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
                                     <select name="business_city" id="businessCity" class="glm-geocodeAction">
-                        {foreach from=$contactInfo.fieldData.city.list item=v}
+                        {foreach from=$contactInfo.fieldData.business_city.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
                                             {$v.name}
                                         </option>
@@ -689,6 +689,7 @@
                                 <th {if $contactInfo.fieldRequired.business_state}class="glm-required"{/if}>State</th>
                                 <td {if $contactInfo.fieldFail.business_state}class="glm-form-bad-input"{/if}>
                                     <select id="business_state" name="business_state" class="glm-geocodeAction">
+                                        <option value=""></option>
                         {foreach from=$contactInfo.fieldData.business_state.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
                                             {$v.name}
@@ -709,6 +710,7 @@
                                 <th {if $contactInfo.fieldRequired.business_country}class="glm-required"{/if}>Country</th>
                                 <td {if $contactInfo.fieldFail.business_country}class="glm-form-bad-input"{/if}>
                                     <select id="business_country" name="business_country" class="glm-geocodeAction">
+                                        <option value=""></option>
                         {foreach from=$contactInfo.fieldData.business_country.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
                                             {$v.name} {$v.value}
@@ -1046,7 +1048,7 @@
             } else {
                 $("#glm-contact-fullprofile-toggle").removeClass("selected");
                 console.log("UNSelect!");
-                
+
             }
         }
 
-- 
2.17.1