More business fields for contacts

Adding first and last name for Company.

diff --git a/classes/data/dataContacts.php b/classes/data/dataContacts.php
index 51de016..b69975e 100644 (file)
--- a/classes/data/dataContacts.php
+++ b/classes/data/dataContacts.php
@@ -450,21 +450,35 @@ class GlmDataContacts extends GlmDataAbstract
                 'use' => 'lged'
             ),
 
-            // Address line 1
+            // Org First Name
+            'business_fname' => array (
+                'field' => 'business_fname',
+                'type' => 'text',
+                'use' => 'a'
+            ),
+
+            // Org Last Name
+            'business_lname' => array (
+                'field' => 'business_lname',
+                'type' => 'text',
+                'use' => 'a'
+            ),
+
+            // Org Address line 1
             'business_addr1' => array (
                 'field' => 'business_addr1',
                 'type' => 'text',
                 'use' => 'a'
             ),
 
-            // Address line 2
+            // Org Address line 2
             'business_addr2' => array (
                 'field' => 'business_addr2',
                 'type' => 'text',
                 'use' => 'a'
             ),
 
-            // City
+            // Org City
             'business_city' => array (
                 'field' => 'business_city',
                 'type' => 'pointer',
@@ -475,7 +489,7 @@ class GlmDataContacts extends GlmDataAbstract
                 'use' => 'a'
             ),
 
-            // State
+            // Org State
             'business_state' => array (
                 'field' => 'business_state',
                 'type' => 'list',
@@ -484,7 +498,7 @@ class GlmDataContacts extends GlmDataAbstract
                 'use' => 'a'
             ),
 
-            // ZIP / Postal Code
+            // Org ZIP / Postal Code
             'business_zip' => array (
                 'field' => 'business_zip',
                 'type' => 'text',
@@ -500,7 +514,7 @@ class GlmDataContacts extends GlmDataAbstract
                 'use' => 'a'
             ),
 
-            // E-Mail Address
+            // Org E-Mail Address
             'business_email' => array(
                 'field'    => 'business_email',
                 'type'     => 'email',

diff --git a/index.php b/index.php
index df2da4c..acdad9e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -40,7 +40,7 @@ if (!defined('ABSPATH')) {
  *  version nunmber of that release for the DB version.
  */
 define('GLM_MEMBERS_CONTACTS_PLUGIN_VERSION', '1.1.10');
-define('GLM_MEMBERS_CONTACTS_PLUGIN_DB_VERSION', '0.0.4');
+define('GLM_MEMBERS_CONTACTS_PLUGIN_DB_VERSION', '0.0.5');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_CONTACTS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '1.0.58');

diff --git a/setup/databaseScripts/create_database_V0.0.4.sql b/setup/databaseScripts/create_database_V0.0.4.sql
deleted file mode 100644 (file)
index bebb7c2..0000000
--- a/setup/databaseScripts/create_database_V0.0.4.sql
+++ /dev/null
@@ -1,70 +0,0 @@
--- Gaslight Media Members Database
--- File Created: 12/09/14 15:27:15
--- Database Version: 0.0.4
--- Database Creation Script - Contacts Add-On
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
---
--- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES ****
---
-
--- Contacts - used by various entities
-CREATE TABLE {prefix}contacts (
-  id INT NOT NULL AUTO_INCREMENT,
-  active BOOLEAN NULL,                      -- Contact is active flag
-  access INT NULL,                          -- Access type - See access table in plugin.ini
-  primary_contact BOOLEAN NULL,             -- Contact is the "Primary Contact" for mailings to entity (ref_type/ref_dest)
-  fname TINYTEXT NULL,                      -- First name of contact
-  lname TINYTEXT NULL,                      -- Last name of contact
-  contact_type INT NULL,                    -- Contact type - see contact_type table (individual, role, ...)
-  contact_role INT NULL,                    -- Contact WordPress user Role
-  org TINYTEXT NULL,                        -- Organization name
-  title TINYTEXT NULL,                      -- Title/Position
-  descr TEXT NULL,                          -- Description of position/responsibilities - Displayed
-  image TINYTEXT NULL,                      -- Image
-  addr1 TINYTEXT NULL,                      -- Address line 1 - Address is for contact, not necessarily for organization
-  addr2 TINYTEXT NULL,                      -- Address line 2
-  county TINYTEXT NULL,                     -- County
-  city INT NULL,                            -- Pointer to city in cities table
-  state TINYTEXT NULL,                      -- Two character state code - matches states.ini entries
-  country TINYTEXT NULL,                    -- Two character country code - matches countries.ini entries
-  zip TINYTEXT NULL,                        -- ZIP/Postal Code
-  lat FLOAT NULL,                           -- Latitude of contact location
-  lon FLOAT NULL,                           -- Longitude of contact location
-  url TINYTEXT NULL,                        -- URL to information regarding this contact
-  home_phone TINYTEXT NULL,                 -- Home phone number - or after-hours phone number
-  mobile_phone TINYTEXT NULL,               -- Mobile phone number
-  alt_phone TINYTEXT NULL,                  -- An alternate phone number
-  email TINYTEXT NULL,                      -- E-Mail address
-  alt_email TINYTEXT NULL,                  -- Alternate E-Mail address - Also used to log-in
-  username TINYTEXT NULL,                   -- Optional username to use for login
-  password TINYTEXT NULL,                   -- Encrypted password
-  notes TEXT NULL,                          -- Notes - Not displayed on front-end
-  create_time TIMESTAMP NULL,               -- Create date/time
-  modify_time TIMESTAMP NULL,               -- Last modified date/time
-  ref_type INT NULL,                        -- Type of entity this contact is associated with
-  ref_dest INT NULL,                        -- Pointer to the specific entity of ref_type this contact is associated with
-  business_addr1 TINYTEXT NULL,             -- Org Address 1
-  business_addr2 TINYTEXT NULL,             -- Org Address 2
-  business_city INT NULL,                   -- Org City
-  business_state TINYTEXT NULL,             -- Org State
-  business_zip TINYTEXT NULL,               -- Org Zip
-  business_country TINYTEXT NULL,           -- Org Country
-  business_email TINYTEXT NULL,             -- Org Email
-  office_phone TINYTEXT NULL,               -- Org Office phone number
-  business_mobile TINYTEXT NULL,            -- Org Mobile
-  fax TINYTEXT NULL,                        -- Org FAX number (do people still use these?)
-  contact_publish BOOLEAN NULL,             -- Flag to publish Contact Info to Directory
-  contact_use_billing BOOLEAN NULL,         -- Flag to use Contact Info as Billing
-  business_publish BOOLEAN NULL,            -- Flag to publish Business to Directory
-  business_use_billing BOOLEAN NULL,        -- Flag to use Business as Billing
-  PRIMARY KEY (id),
-  INDEX(fname(20)),
-  INDEX(lname(20)),
-  INDEX(city),
-  INDEX(zip(10)),
-  INDEX(lat),
-  INDEX(lon),
-  INDEX(email(20))
-);

diff --git a/setup/databaseScripts/create_database_V0.0.5.sql b/setup/databaseScripts/create_database_V0.0.5.sql
new file mode 100644 (file)
index 0000000..1a6175b
--- /dev/null
+++ b/setup/databaseScripts/create_database_V0.0.5.sql
@@ -0,0 +1,72 @@
+-- Gaslight Media Members Database
+-- File Created: 12/09/14 15:27:15
+-- Database Version: 0.0.4
+-- Database Creation Script - Contacts Add-On
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+--
+-- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES ****
+--
+
+-- Contacts - used by various entities
+CREATE TABLE {prefix}contacts (
+  id INT NOT NULL AUTO_INCREMENT,
+  active BOOLEAN NULL,                      -- Contact is active flag
+  access INT NULL,                          -- Access type - See access table in plugin.ini
+  primary_contact BOOLEAN NULL,             -- Contact is the "Primary Contact" for mailings to entity (ref_type/ref_dest)
+  fname TINYTEXT NULL,                      -- First name of contact
+  lname TINYTEXT NULL,                      -- Last name of contact
+  contact_type INT NULL,                    -- Contact type - see contact_type table (individual, role, ...)
+  contact_role INT NULL,                    -- Contact WordPress user Role
+  org TINYTEXT NULL,                        -- Organization name
+  title TINYTEXT NULL,                      -- Title/Position
+  descr TEXT NULL,                          -- Description of position/responsibilities - Displayed
+  image TINYTEXT NULL,                      -- Image
+  addr1 TINYTEXT NULL,                      -- Address line 1 - Address is for contact, not necessarily for organization
+  addr2 TINYTEXT NULL,                      -- Address line 2
+  county TINYTEXT NULL,                     -- County
+  city INT NULL,                            -- Pointer to city in cities table
+  state TINYTEXT NULL,                      -- Two character state code - matches states.ini entries
+  country TINYTEXT NULL,                    -- Two character country code - matches countries.ini entries
+  zip TINYTEXT NULL,                        -- ZIP/Postal Code
+  lat FLOAT NULL,                           -- Latitude of contact location
+  lon FLOAT NULL,                           -- Longitude of contact location
+  url TINYTEXT NULL,                        -- URL to information regarding this contact
+  home_phone TINYTEXT NULL,                 -- Home phone number - or after-hours phone number
+  mobile_phone TINYTEXT NULL,               -- Mobile phone number
+  alt_phone TINYTEXT NULL,                  -- An alternate phone number
+  email TINYTEXT NULL,                      -- E-Mail address
+  alt_email TINYTEXT NULL,                  -- Alternate E-Mail address - Also used to log-in
+  username TINYTEXT NULL,                   -- Optional username to use for login
+  password TINYTEXT NULL,                   -- Encrypted password
+  notes TEXT NULL,                          -- Notes - Not displayed on front-end
+  create_time TIMESTAMP NULL,               -- Create date/time
+  modify_time TIMESTAMP NULL,               -- Last modified date/time
+  ref_type INT NULL,                        -- Type of entity this contact is associated with
+  ref_dest INT NULL,                        -- Pointer to the specific entity of ref_type this contact is associated with
+  business_fname TINYTEXT NULL,             -- Org First Name
+  business_lname TINYTEXT NULL,             -- Org Last Name
+  business_addr1 TINYTEXT NULL,             -- Org Address 1
+  business_addr2 TINYTEXT NULL,             -- Org Address 2
+  business_city INT NULL,                   -- Org City
+  business_state TINYTEXT NULL,             -- Org State
+  business_zip TINYTEXT NULL,               -- Org Zip
+  business_country TINYTEXT NULL,           -- Org Country
+  business_email TINYTEXT NULL,             -- Org Email
+  office_phone TINYTEXT NULL,               -- Org Office phone number
+  business_mobile TINYTEXT NULL,            -- Org Mobile
+  fax TINYTEXT NULL,                        -- Org FAX number (do people still use these?)
+  contact_publish BOOLEAN NULL,             -- Flag to publish Contact Info to Directory
+  contact_use_billing BOOLEAN NULL,         -- Flag to use Contact Info as Billing
+  business_publish BOOLEAN NULL,            -- Flag to publish Business to Directory
+  business_use_billing BOOLEAN NULL,        -- Flag to use Business as Billing
+  PRIMARY KEY (id),
+  INDEX(fname(20)),
+  INDEX(lname(20)),
+  INDEX(city),
+  INDEX(zip(10)),
+  INDEX(lat),
+  INDEX(lon),
+  INDEX(email(20))
+);

diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index c584960..83046be 100644 (file)
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -31,6 +31,7 @@ $glmMembersContactsDbVersions = array(
     '0.0.2' => array('version' => '0.0.2', 'tables' => 1, 'date' => '7/25/2016'),
     '0.0.3' => array('version' => '0.0.3', 'tables' => 1, 'date' => '1/11/2017'),
     '0.0.4' => array('version' => '0.0.4', 'tables' => 1, 'date' => '07/26/2018'),
+    '0.0.5' => array('version' => '0.0.5', 'tables' => 1, 'date' => '07/26/2018'),
 );
 
 

diff --git a/setup/databaseScripts/update_database_V0.0.5.sql b/setup/databaseScripts/update_database_V0.0.5.sql
new file mode 100644 (file)
index 0000000..8ab4cfa
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.0.5.sql
@@ -0,0 +1,13 @@
+-- Gaslight Media Members Database  - Contacts Add-On
+-- File Created: 2018-07-26
+-- Database Version: 0.0.4
+-- 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 dashses
+
+ALTER TABLE {prefix}contacts ADD COLUMN business_fname TINYTEXT NULL;             -- Org First Name
+
+----
+
+ALTER TABLE {prefix}contacts ADD COLUMN business_lname TINYTEXT NULL;             -- Org Last Name