From 79cbf7e649c5396ec916e2205f782a0d5d49cbd2 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 27 Feb 2019 14:24:02 -0500 Subject: [PATCH] Add fax and new option for members Adding Fax number to member info. Adding new option for full text search. --- classes/data/dataMemberInfo.php | 7 ++ index.php | 2 +- models/admin/import/index.php | 4 +- ...1.1.51.sql => create_database_V1.1.52.sql} | 6 +- setup/databaseScripts/dbVersions.php | 1 + .../update_database_V1.1.51.sql | 2 +- .../update_database_V1.1.52.sql | 15 +++ .../member/memberInfo/editProfileContact.html | 101 ++++++++++-------- 8 files changed, 86 insertions(+), 52 deletions(-) rename setup/databaseScripts/{create_database_V1.1.51.sql => create_database_V1.1.52.sql} (99%) create mode 100755 setup/databaseScripts/update_database_V1.1.52.sql diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index 99870f10..6ec1ec1f 100755 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -352,6 +352,13 @@ class GlmDataMemberInfo extends GlmDataAbstract 'use' => 'a' ), + // Fax + 'fax' => array( + 'field' => 'fax', + 'type' => 'phone', + 'use' => 'a' + ), + // Toll Free 'toll_free' => array( 'field' => 'toll_free', diff --git a/index.php b/index.php index cc5c0dc8..cc948884 100755 --- a/index.php +++ b/index.php @@ -48,7 +48,7 @@ if (!defined('ABSPATH')) { */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.11.2'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.51'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.52'); // 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/models/admin/import/index.php b/models/admin/import/index.php index 8182b9b1..cc160921 100644 --- a/models/admin/import/index.php +++ b/models/admin/import/index.php @@ -321,7 +321,7 @@ class GlmMembersAdmin_import_index 'id', 'old_member_id', 'member_name', 'member_type', 'status', 'short_descr', 'descr', 'addr1', 'addr2', 'city', 'state', 'country', 'zip', 'mailing_addr1', 'mailing_addr2', 'mailing_city', 'mailing_state', 'mailing_zip', - 'region', 'county', 'lat', 'lon', 'phone', 'toll_free', + 'region', 'county', 'lat', 'lon', 'phone', 'fax', 'toll_free', 'url', 'reservation_url', 'email', 'logo', 'categories', 'amenities' ), 'type' => 'member', @@ -1365,6 +1365,7 @@ class GlmMembersAdmin_import_index 'lat' => $data['lat'], 'lon' => $data['lon'], 'phone' => $data['phone'], + 'fax' => $data['fax'], 'toll_free' => $data['toll_free'], 'url' => ((strlen($data['url']) > 250) ? substr($data['url'], 0, 250) : $data['url']), 'reservation_url' => $data['reservation_url'], @@ -1398,6 +1399,7 @@ class GlmMembersAdmin_import_index '%s', // lat '%s', // lon '%s', // phone + '%s', // fax '%s', // toll_free '%s', // url '%s', // reservation_url diff --git a/setup/databaseScripts/create_database_V1.1.51.sql b/setup/databaseScripts/create_database_V1.1.52.sql similarity index 99% rename from setup/databaseScripts/create_database_V1.1.51.sql rename to setup/databaseScripts/create_database_V1.1.52.sql index 3a2bcf31..0f917961 100755 --- a/setup/databaseScripts/create_database_V1.1.51.sql +++ b/setup/databaseScripts/create_database_V1.1.52.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 12/29/16 12:06:00 --- Database Version: 1.1.51 +-- Database Version: 1.1.52 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -198,7 +198,7 @@ CREATE TABLE {prefix}member_detail_stats ( ---- -- Member information version record - May be multiples per member - Only one with status "Active" for a distinct date range -CREATE TABLE {prefix}member_info ( +CREATE TABLE {prefix}mmember_infoember_info ( id INT NOT NULL AUTO_INCREMENT, member INT NULL, -- Pointer to member record in table members member_name TINYTEXT NULL, -- Copy of member name from members table entry for fast reference @@ -219,6 +219,7 @@ CREATE TABLE {prefix}member_info ( region INT NULL, -- Pointer to entry in regions table county INT NULL, -- Pointer to entry in regions table phone TINYTEXT NULL, -- Primary phone number + fax TINYTEXT NULL, -- Fax Number toll_free TINYTEXT NULL, -- Toll Free phone number url TINYTEXT NULL, -- URL with information about this member reservation_url TEXT NULL, -- Reservation URL @@ -358,6 +359,7 @@ CREATE TABLE {prefix}settings_general ( list_pagination BOOLEAN DEFAULT '1', list_ajax_pagination BOOLEAN DEFAULT '0', list_pagination_count SMALLINT DEFAULT '20', + list_fulltext_search BOOLEAN DEFAULT '0', list_show_sidebar_area BOOLEAN DEFAULT '0', list_show_header_text BOOLEAN DEFAULT '1', list_show_entities_found BOOLEAN DEFAULT '1', diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 19411041..a8c05376 100755 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -83,6 +83,7 @@ $glmMembersDbVersions = array( '1.1.49' => array('version' => '1.1.49', 'tables' => 23, 'date' => '02/15/19'), '1.1.50' => array('version' => '1.1.50', 'tables' => 23, 'date' => '02/20/19'), '1.1.51' => array('version' => '1.1.51', 'tables' => 23, 'date' => '02/26/19'), + '1.1.52' => array('version' => '1.1.52', 'tables' => 23, 'date' => '02/27/19'), ); diff --git a/setup/databaseScripts/update_database_V1.1.51.sql b/setup/databaseScripts/update_database_V1.1.51.sql index c99e3ab8..d996b549 100755 --- a/setup/databaseScripts/update_database_V1.1.51.sql +++ b/setup/databaseScripts/update_database_V1.1.51.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database -- File Created: 2019-02-15 --- Database Version: 1.1.49 +-- Database Version: 1.1.51 -- Database Update From Previous Version Script -- -- To permit each query below to be executed separately, diff --git a/setup/databaseScripts/update_database_V1.1.52.sql b/setup/databaseScripts/update_database_V1.1.52.sql new file mode 100755 index 00000000..3b0d9259 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.52.sql @@ -0,0 +1,15 @@ +-- Gaslight Media Members Database +-- File Created: 2019-02-15 +-- Database Version: 1.1.52 +-- 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 + +-- Add fax to member info record +ALTER TABLE {prefix}member_info ADD COLUMN fax TINYTEXT NULL; -- Fax Number + +---- + +-- Add setting +ALTER TABLE {prefix}settings_general ADD COLUMN list_fulltext_search BOOLEAN DEFAULT '0'; diff --git a/views/admin/member/memberInfo/editProfileContact.html b/views/admin/member/memberInfo/editProfileContact.html index 7e04111b..677d1c7f 100644 --- a/views/admin/member/memberInfo/editProfileContact.html +++ b/views/admin/member/memberInfo/editProfileContact.html @@ -1,48 +1,55 @@ -
-

Contact Info for Website

-
-
+
+

Contact Info for Website

+
+
-
-

Phone #:

-
- - {if $memberInfo.fieldFail.phone}

{$memberInfo.fieldFail.phone}

{/if} -
-
-
-

Toll Free #:

-
- - {if $memberInfo.fieldFail.toll_free}

{$memberInfo.fieldFail.toll_free}

{/if} -
-
-
-

E-Mail Address:

-
- - {if $memberInfo.fieldFail.email}

{$memberInfo.fieldFail.email}

{/if} -
-
-
-

Web Address (URL):

-
- {if $memberInfo.fieldData.url} - Test Link - {/if} - - {if $memberInfo.fieldFail.url}

{$memberInfo.fieldFail.url}

{/if} -
-
-
-

Reservation URL:

-
- {if $memberInfo.fieldData.reservation_url} - Test Link - {/if} - - {if $memberInfo.fieldFail.reservation_url}

{$memberInfo.fieldFail.reservation_url}

{/if} -
-
-
-
+
+

Phone #:

+
+ + {if $memberInfo.fieldFail.phone}

{$memberInfo.fieldFail.phone}

{/if} +
+
+
+

Fax #:

+
+ + {if $memberInfo.fieldFail.fax}

{$memberInfo.fieldFail.fax}

{/if} +
+
+
+

Toll Free #:

+
+ + {if $memberInfo.fieldFail.toll_free}

{$memberInfo.fieldFail.toll_free}

{/if} +
+
+
+

E-Mail Address:

+
+ + {if $memberInfo.fieldFail.email}

{$memberInfo.fieldFail.email}

{/if} +
+
+
+

Web Address (URL):

+
+ {if $memberInfo.fieldData.url} + Test Link + {/if} + + {if $memberInfo.fieldFail.url}

{$memberInfo.fieldFail.url}

{/if} +
+
+
+

Reservation URL:

+
+ {if $memberInfo.fieldData.reservation_url} + Test Link + {/if} + + {if $memberInfo.fieldFail.reservation_url}

{$memberInfo.fieldFail.reservation_url}

{/if} +
+
+
+
-- 2.17.1