From c7634f24335e13e04d1cb42f1edc2b5da613f7f4 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Tue, 30 Aug 2016 13:32:10 -0400
Subject: [PATCH] Phone infix and default state added in mgmt

- Phone separator character can now be customised in admin
management.
- Default state selection can now be set in the admin side.
---
 classes/data/settings/dataSettingsGeneral.php | 20 ++++++++++++++++++-
 css/admin.css                                 |  3 +++
 index.php                                     |  4 ++--
 ...1.1.16.sql => create_database_V1.1.17.sql} |  4 +++-
 setup/databaseScripts/dbVersions.php          |  3 ++-
 .../update_database_V1.1.17.sql               | 13 ++++++++++++
 views/admin/management/index.html             | 19 ++++++++++++++++++
 views/admin/member/memberInfo.html            |  8 ++++----
 views/front/members/detail.html               | 11 +++++-----
 9 files changed, 70 insertions(+), 15 deletions(-)
 rename setup/databaseScripts/{create_database_V1.1.16.sql => create_database_V1.1.17.sql} (99%)
 create mode 100644 setup/databaseScripts/update_database_V1.1.17.sql

diff --git a/classes/data/settings/dataSettingsGeneral.php b/classes/data/settings/dataSettingsGeneral.php
index 46516141..32d040e9 100644
--- a/classes/data/settings/dataSettingsGeneral.php
+++ b/classes/data/settings/dataSettingsGeneral.php
@@ -193,6 +193,24 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                         'type' => 'text',
                         'use' => 'a'
                 ),
+            
+                // Character to use as phone infix
+                'phone_infix' => array(
+                        'field' => 'phone_infix',
+                        'type' => 'text',
+                        'use' => 'a'
+                ),
+            
+                // Default State
+                'default_state' => array (
+                    'field' => 'default_state',
+                    'type' => 'list',
+                    'list' => $this->config['states'],
+                    'default' => 'MI',
+                    'force_list' => true,
+                    'use' => 'a'
+                ),
+            
 
                 /*
                  * Front-end Member Search Options
@@ -721,7 +739,7 @@ class GlmDataSettingsGeneral extends GlmDataAbstract
                         'default' => false,
                         'use' => 'a'
                 ),
-
+                
                 // Front-end Member Detail - Show Toll Free
                 'detail_show_tollfree' => array(
                         'field' => 'detail_show_tollfree',
diff --git a/css/admin.css b/css/admin.css
index 5353c104..fca92335 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -102,6 +102,9 @@
     width: 3.5em;
     text-align: right;
 }
+.glm-form-text-input-character {
+    width: 2em;
+}
 .glm-form-text-input-veryshort {
     width: 6em;
 }
diff --git a/index.php b/index.php
index 12d4e373..e2cff610 100644
--- a/index.php
+++ b/index.php
@@ -38,8 +38,8 @@
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.5.4');
-define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.16');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.5.5');
+define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.17');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
 if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) {
diff --git a/setup/databaseScripts/create_database_V1.1.16.sql b/setup/databaseScripts/create_database_V1.1.17.sql
similarity index 99%
rename from setup/databaseScripts/create_database_V1.1.16.sql
rename to setup/databaseScripts/create_database_V1.1.17.sql
index 69c3d864..33ba29cd 100644
--- a/setup/databaseScripts/create_database_V1.1.16.sql
+++ b/setup/databaseScripts/create_database_V1.1.17.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database
 -- File Created: 12/09/14 15:27:15
--- Database Version: 1.1.16
+-- Database Version: 1.1.17
 -- Database Creation Script
 --
 -- To permit each query below to be executed separately,
@@ -263,6 +263,8 @@ CREATE TABLE {prefix}settings_general (
   maps_default_zoom INTEGER DEFAULT '10',
   time_zone TINYTEXT DEFAULT NULL,
   canonical_member_page TINYTEXT DEFAULT NULL,
+  phone_infix TINYTEXT DEFAULT NULL,
+  default_state TINYTEXT DEFAULT NULL,
   list_show_map BOOLEAN DEFAULT '1',
   list_show_list BOOLEAN DEFAULT '1',
   list_show_search_filters_opened BOOLEAN DEFAULT '0',
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 4bc788f6..fdd9c4bc 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -47,7 +47,8 @@ $glmMembersDbVersions = array(
     '1.1.13' => array('version' => '1.1.13', 'tables' => 18, 'date' => '8/4/16'),
     '1.1.14' => array('version' => '1.1.14', 'tables' => 18, 'date' => '8/15/16'),
     '1.1.15' => array('version' => '1.1.15', 'tables' => 18, 'date' => '8/19/16'),
-    '1.1.16' => array('version' => '1.1.16', 'tables' => 18, 'date' => '8/22/16')
+    '1.1.16' => array('version' => '1.1.16', 'tables' => 18, 'date' => '8/22/16'),
+    '1.1.17' => array('version' => '1.1.17', 'tables' => 18, 'date' => '8/29/16'),
 );
 
 
diff --git a/setup/databaseScripts/update_database_V1.1.17.sql b/setup/databaseScripts/update_database_V1.1.17.sql
new file mode 100644
index 00000000..89ffe708
--- /dev/null
+++ b/setup/databaseScripts/update_database_V1.1.17.sql
@@ -0,0 +1,13 @@
+-- Gaslight Media Members Database 
+-- File Created: 8/15/16 14:59:42
+-- Database Version: 1.1.17
+-- Database Update From Previous Version Script
+-- 
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+-- Sets which character to use to separate phone numbers
+ALTER TABLE {prefix}settings_general ADD COLUMN phone_infix TINYTEXT NULL;
+
+----
+
+ALTER TABLE {prefix}settings_general ADD COLUMN default_state TINYTEXT NULL;
\ No newline at end of file
diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index a97b5fa0..4e6db5d0 100644
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -134,6 +134,25 @@
                     <br>Use only the page name at the end of the permalink for the member detail page.
                 </td>
             </tr>
+            <tr>
+               <th>Phone Separation Character:</th>
+                <td>
+                    <input type="text" name="phone_infix" value="{$genSettings.fieldData.phone_infix}" class="glm-form-text-input-character" pattern="\W" maxlength="1" placeholder="-"> Must NOT be a letter or number
+                </td>
+            </tr>
+            <tr>
+                <th>Default State:</th>
+                <td>
+                    <select id="default-state" data-id="default_state" class="location-address" name="default_state">
+                        <option value=""></option>
+                        {foreach from=$genSettings.fieldData.default_state.list item=v}
+                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                            {$v.name}
+                        </option>
+                        {/foreach}
+                    </select>
+                </td>
+            </tr>
         </table>
         
             <!-- Member List Page Options -->
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 64b1d18c..4dbddbf2 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -218,8 +218,8 @@
                 <td {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                     <select id="state" name="state">
         {foreach from=$memberInfo.fieldData.state.list item=v}
-                        <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                            {$v.name}
+                        <option value="{$v.value}"{if $settings.default_state == $v.value} selected="selected"{/if}>
+                            {$v.name} {if $settings.default_state == $v.value} (default){/if}
                         </option>
         {/foreach}
                     </select>
@@ -290,7 +290,7 @@
             <tr>
                 <th {if $memberInfo.fieldRequired.toll_free}class="glm-required"{/if}>Toll Free #:</th>
                 <td {if $memberInfo.fieldFail.toll_free}class="glm-form-bad-input" data-tabid="glm-member-info-contact"{/if}>
-                    <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800-123-4567 [ext 123]">
+                    <input type="text" name="toll_free" value="{$memberInfo.fieldData.toll_free}" class="glm-form-text-input-short glm-phone-input" placeholder="ex: 800.123.4567 [ext 123]">
                     {if $memberInfo.fieldFail.toll_free}<p>{$memberInfo.fieldFail.toll_free}</p>{/if}
                 </td>
             </tr>
@@ -1261,7 +1261,7 @@
             
             // Set masking for phone number fields - see http://digitalbush.com/projects/masked-input-plugin/
             $.mask.definitions['e'] = "[A-Za-z0-9: ]";
-            $(".glm-phone-input").mask("999-999-9999? eeeeeeeeeee");
+            $(".glm-phone-input").mask("999{$settings.phone_infix}999{$settings.phone_infix}9999? eeeeeeeeeee");
                             
         });
     </script>
diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index a6638d9a..b4a6e5c1 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -76,8 +76,7 @@
                             {if $settings.detail_show_citystatezip}
                                 <div>
                                     {if $member.city}
-                                        <span>{$member.city}</span>
-                                        {if $member.state.value}, {/if}
+                                        <span>{$member.city}{if $member.state.value}, {/if}</span>
                                     {/if}
                                     {if $member.state.value}
                                         <span>{$member.state.value}</span>
@@ -102,14 +101,14 @@
                     <div class="glm-member-detail-phone-wrapper">
                         {if $member.phone && $settings.detail_show_phone}
                             <div class="glm-member-detail-contact-phone">
-                                <small>Local </small>
-                                <div>{$member.phone}</div>
+                                <small class="glm-field-title">Local </small>
+                                <div class="glm-field-value">{$member.phone}</div>
                             </div>
                         {/if}
                         {if $member.toll_free && $settings.detail_show_tollfree}
                             <div>
-                                <small>Toll Free </small>
-                                <div>{$member.toll_free}</div>
+                                <small class="glm-field-title">Toll Free </small>
+                                <div class="glm-field-value">{$member.toll_free}</div>
                             </div>
                         {/if}
                     </div>
-- 
2.17.1