From 11e8aec9ebe3bab95752cd4c75152c012d356161 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Wed, 18 Oct 2017 11:20:17 -0400 Subject: [PATCH] Updated database - removed magic-form and added field tables. Added pointer fields in the dataRegRequestRate.php, dataRegRequestClass.php, dataRegRequestRegistrant.php classes to make event name available there. --- classes/data/dataRegRequestClass.php | 12 +++ classes/data/dataRegRequestRate.php | 20 +++-- classes/data/dataRegRequestRegistrant.php | 12 +++ index.php | 2 +- models/front/registrations/cart.php | 4 +- ...0.0.14.sql => create_database_V0.0.15.sql} | 90 ------------------- setup/databaseScripts/dbVersions.php | 3 +- ..._V0.0.14.sql => drop_database_V0.0.15.sql} | 5 -- .../update_database_V0.0.15.sql | 25 ++++++ 9 files changed, 67 insertions(+), 106 deletions(-) rename setup/databaseScripts/{create_database_V0.0.14.sql => create_database_V0.0.15.sql} (93%) rename setup/databaseScripts/{drop_database_V0.0.14.sql => drop_database_V0.0.15.sql} (82%) create mode 100644 setup/databaseScripts/update_database_V0.0.15.sql diff --git a/classes/data/dataRegRequestClass.php b/classes/data/dataRegRequestClass.php index c715d5c..573ce39 100644 --- a/classes/data/dataRegRequestClass.php +++ b/classes/data/dataRegRequestClass.php @@ -140,6 +140,18 @@ class GlmDataRegistrationsRequestClass extends GlmDataAbstract 'use' => 'lgneud' ), + // Event Name + 'event_name' => array ( + 'field' => 'reg_request_event', + 'as' => 'event_name', + 'type' => 'pointer', + 'p_table' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . 'reg_request_event', + 'p_field' => 'event_name', + 'p_static' => true, + 'required' => true, + 'use' => 'lg' + ), + // Pointer to reg_class table entry 'class' => array ( 'field' => 'class', diff --git a/classes/data/dataRegRequestRate.php b/classes/data/dataRegRequestRate.php index 5e1d140..97a799a 100644 --- a/classes/data/dataRegRequestRate.php +++ b/classes/data/dataRegRequestRate.php @@ -125,14 +125,6 @@ class GlmDataRegistrationsRegRequestRate extends GlmDataAbstract 'use' => 'lgneud' ), - // Event Name - 'event_name' => array ( - 'field' => 'event_name', - 'type' => 'text', - 'required' => true, - 'use' => 'lgneud' - ), - // Selected Start Time 'event_datetime' => array ( 'field' => 'event_datetime', @@ -149,6 +141,18 @@ class GlmDataRegistrationsRegRequestRate extends GlmDataAbstract 'use' => 'lgneud' ), + // Event Name + 'event_name' => array ( + 'field' => 'reg_request_event', + 'as' => 'event_name', + 'type' => 'pointer', + 'p_table' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . 'reg_request_event', + 'p_field' => 'event_name', + 'p_static' => true, + 'required' => true, + 'use' => 'lg' + ), + // Pointer to reg_request_class table entry 'reg_request_class' => array ( 'field' => 'reg_request_class', diff --git a/classes/data/dataRegRequestRegistrant.php b/classes/data/dataRegRequestRegistrant.php index 5b6a151..c0ae9a5 100644 --- a/classes/data/dataRegRequestRegistrant.php +++ b/classes/data/dataRegRequestRegistrant.php @@ -156,6 +156,18 @@ class GlmDataRegistrationsRequestRegistrant extends GlmDataAbstract 'use' => 'lgneud' ), + // Event Name + 'event_name' => array ( + 'field' => 'reg_request_event', + 'as' => 'event_name', + 'type' => 'pointer', + 'p_table' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . 'reg_request_event', + 'p_field' => 'event_name', + 'p_static' => true, + 'required' => true, + 'use' => 'lg' + ), + // Pointer to reg_request_class table entry 'reg_request_class' => array ( 'field' => 'reg_request_class', diff --git a/index.php b/index.php index 201290c..cafe600 100644 --- a/index.php +++ b/index.php @@ -44,7 +44,7 @@ if (!defined('ABSPATH')) { * version from this plugin. */ define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_VERSION', '0.0.1'); -define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.14'); +define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.15'); // This is the minimum version of the GLM Members DB plugin require for this plugin. define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.10.10'); diff --git a/models/front/registrations/cart.php b/models/front/registrations/cart.php index fe81c5f..e7e03e3 100644 --- a/models/front/registrations/cart.php +++ b/models/front/registrations/cart.php @@ -145,7 +145,9 @@ class GlmMembersFront_registrations_cart extends GlmRegCartSupport break; } -//echo "
".print_r($this->config,1)."
"; + + echo "
".print_r($this->cart,1)."
"; + // Compile template data $templateData = array( 'cartId' => $cartId, diff --git a/setup/databaseScripts/create_database_V0.0.14.sql b/setup/databaseScripts/create_database_V0.0.15.sql similarity index 93% rename from setup/databaseScripts/create_database_V0.0.14.sql rename to setup/databaseScripts/create_database_V0.0.15.sql index 6d4e585..90a844b 100644 --- a/setup/databaseScripts/create_database_V0.0.14.sql +++ b/setup/databaseScripts/create_database_V0.0.15.sql @@ -189,96 +189,6 @@ CREATE TABLE {prefix}misc ( ---- --- Additional fields for collecting information for various things - submission, event registration, or registrant --- Related to the registration submission or specific event registration -CREATE TABLE {prefix}added_info_fields ( - id INT NOT NULL AUTO_INCREMENT, - ref_type TINYINT NULL, -- See data_ref_type table in plugin.ini - ref_dest INT NULL, -- Pointer to the specific entity of ref_type - (not user submitted data record) - name TINYTEXT NULL, -- Displayed field prompt - also used on retrieval of data - description TINYTEXT NULL, -- Description of field - possibly to display to user - PRIMARY KEY (id), - INDEX (ref_dest) -); - ----- - --- Additional field data for various specific things -CREATE TABLE {prefix}added_info_data ( - id INT NOT NULL AUTO_INCREMENT, - added_info_field INT NULL, -- Pointer to added_info_field table - ref_type TINYINT NULL, -- See data ref_type table in plugin.ini - ref_dest INT NULL, -- Pointer to specific entryt of the correct type (user submitted data record) - field_value TINYTEXT NULL, - PRIMARY KEY (id), - INDEX (ref_dest) -); - - ----- - --- magicform -CREATE TABLE {prefix}magicform ( - id INT NOT NULL AUTO_INCREMENT, - form_id TINYTEXT NULL, - custom_id TINYTEXT NULL, - title TINYTEXT NULL, - type SMALLINT NULL, - descr TEXT NULL, - active BOOLEAN NULL, - required BOOLEAN NULL, - data1 TINYTEXT NULL, - sort SMALLINT NULL, - expanded BOOLEAN NULL, - style TEXT NULL, - file TINYTEXT NULL, - cols INT NULL, - rows INT NULL, - size TINYTEXT NULL, - format TINYTEXT NULL, - default_val TINYTEXT NULL, - PRIMARY KEY (id), - INDEX(form_id(20)) -); - ----- - --- mf_data -CREATE TABLE {prefix}mf_data ( - id INT NOT NULL AUTO_INCREMENT, - fiid INT NULL, - form_id TINYTEXT NULL, - field_id TINYTEXT NULL, - level TINYTEXT NULL, - title TINYTEXT NULL, - type INT NULL, - txt_type TEXT NULL, - value TEXT NULL, - numb_value DOUBLE PRECISION NULL, - txt_value TEXT NULL, - opt_num INT NULL, - valid BOOLEAN NULL, - required BOOLEAN NULL, - failure TEXT NULL, - PRIMARY KEY (id), - INDEX(form_id(20)), - INDEX(fiid) -); - ----- - --- mf_temp_file -CREATE TABLE {prefix}mf_temp_file ( - id INT NOT NULL AUTO_INCREMENT, - file_name TINYTEXT NULL, - upload_time DATE NULL, - PRIMARY KEY (id), - INDEX(file_name(20)), - INDEX(upload_time) -); - ----- - -- Payment Codes -- Promotional payment codes for free/discounted payment CREATE TABLE {prefix}payment_code ( diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index dcacaa2..7e8a609 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -27,7 +27,8 @@ $glmMembersRegistrationsDbVersions = array( '0.0.11' => array('version' => '0.0.11', 'tables' => 20, 'date' => '04/29/2017'), '0.0.12' => array('version' => '0.0.12', 'tables' => 20, 'date' => '09/11/2017'), '0.0.13' => array('version' => '0.0.13', 'tables' => 20, 'date' => '10/03/2017'), - '0.0.14' => array('version' => '0.0.14', 'tables' => 20, 'date' => '10/13/2017') + '0.0.14' => array('version' => '0.0.14', 'tables' => 20, 'date' => '10/13/2017'), + '0.0.15' => array('version' => '0.0.15', 'tables' => 15, 'date' => '10/18/2017') ); diff --git a/setup/databaseScripts/drop_database_V0.0.14.sql b/setup/databaseScripts/drop_database_V0.0.15.sql similarity index 82% rename from setup/databaseScripts/drop_database_V0.0.14.sql rename to setup/databaseScripts/drop_database_V0.0.15.sql index 92113cd..1451bb2 100644 --- a/setup/databaseScripts/drop_database_V0.0.14.sql +++ b/setup/databaseScripts/drop_database_V0.0.15.sql @@ -8,11 +8,6 @@ DROP TABLE IF EXISTS {prefix}management, {prefix}settings_terms, {prefix}misc, - {prefix}added_info_fields, - {prefix}added_info_data, - {prefix}magicform, - {prefix}mf_data, - {prefix}mf_temp_file, {prefix}payment_code, {prefix}reg_event, {prefix}reg_time, diff --git a/setup/databaseScripts/update_database_V0.0.15.sql b/setup/databaseScripts/update_database_V0.0.15.sql new file mode 100644 index 0000000..31c0d33 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.15.sql @@ -0,0 +1,25 @@ +-- Gaslight Media Members Database - Registratiuons Add-On +-- File Created: 10/03/17 11:00:00 +-- Database Version: 0.0.13 +-- 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 + +DROP TABLE {prefix}added_info_fields; + +---- + +DROP TABLE {prefix}added_info_data; + +---- + +DROP TABLE {prefix}magicform; + +---- + +DROP TABLE {prefix}mf_data; + +---- + +DROP TABLE {prefix}mf_temp_file; -- 2.17.1