From 415373feb3c4ee53ca320e16828a2ef7a4527525 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 29 Aug 2017 13:46:26 -0400 Subject: [PATCH] Updated database to include validated and validation_code fields to account table. Removed tabs from top of registrations admin pages. Added tabs to top of event registration edit page to permit separate tabs of things that will be updated. --- index.php | 2 +- models/admin/registrations/event.php | 5 +- ...0.0.10.sql => create_database_V0.0.11.sql} | 2 + setup/databaseScripts/dbVersions.php | 3 +- ..._V0.0.10.sql => drop_database_V0.0.11.sql} | 1 + .../update_database_V0.0.11.sql | 14 ++ views/admin/registrations/eventEdit.html | 206 ++++-------------- .../admin/registrations/eventEditLevels.html | 58 +++++ .../registrations/eventEditSettings.html | 160 ++++++++++++++ views/admin/registrations/header.html | 7 - 10 files changed, 289 insertions(+), 169 deletions(-) rename setup/databaseScripts/{create_database_V0.0.10.sql => create_database_V0.0.11.sql} (99%) rename setup/databaseScripts/{drop_database_V0.0.10.sql => drop_database_V0.0.11.sql} (95%) create mode 100644 setup/databaseScripts/update_database_V0.0.11.sql create mode 100644 views/admin/registrations/eventEditLevels.html create mode 100644 views/admin/registrations/eventEditSettings.html diff --git a/index.php b/index.php index 859ace9..c8eac2e 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.10'); +define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.11'); // 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.8.0'); diff --git a/models/admin/registrations/event.php b/models/admin/registrations/event.php index 94e8b49..8f06f93 100644 --- a/models/admin/registrations/event.php +++ b/models/admin/registrations/event.php @@ -153,7 +153,8 @@ class GlmMembersAdmin_registrations_event extends GlmDataRegistrationsRegEvent case 'add': case 'edit': - + + // If we're adding a new reg event if ($option == 'add') { // Verify that event is not already listed @@ -350,7 +351,7 @@ class GlmMembersAdmin_registrations_event extends GlmDataRegistrationsRegEvent if ($haveRegEvent) { update_option('glmMembersDatabaseLastUsedRegEventID', $regEventID); } - + // Compile template data $templateData = array( 'option' => $option, diff --git a/setup/databaseScripts/create_database_V0.0.10.sql b/setup/databaseScripts/create_database_V0.0.11.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.0.10.sql rename to setup/databaseScripts/create_database_V0.0.11.sql index 85d0af4..015fa04 100644 --- a/setup/databaseScripts/create_database_V0.0.10.sql +++ b/setup/databaseScripts/create_database_V0.0.11.sql @@ -413,6 +413,8 @@ CREATE TABLE {prefix}reg_rate ( CREATE TABLE {prefix}account ( id INT NOT NULL AUTO_INCREMENT, active BOOLEAN NULL, -- Is active flag (may be accessed or used) - default is true + validated BOOLEAN NULL, -- Flag indicating that the account has been validated - Set to false when recovering password + validation_code TINYTEXT NULL, -- Validation code and timestamp ("{validation code}-{timestamp}) - Clear this after validation registered_by INT NULL, -- Account member_id TINYTEXT NULL, -- Free-form field for a member ID (not a GLM Associate member ID) fname TINYTEXT NULL, -- Account primary address diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 7ad380a..7efff20 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -23,7 +23,8 @@ $glmMembersRegistrationsDbVersions = array( '0.0.7' => array('version' => '0.0.7', 'tables' => 19, 'date' => '04/07/2017'), '0.0.8' => array('version' => '0.0.8', 'tables' => 19, 'date' => '04/18/2017'), '0.0.9' => array('version' => '0.0.9', 'tables' => 19, 'date' => '04/24/2017'), - '0.0.10' => array('version' => '0.0.10', 'tables' => 20, 'date' => '04/25/2017') + '0.0.10' => array('version' => '0.0.10', 'tables' => 20, 'date' => '04/25/2017'), + '0.0.11' => array('version' => '0.0.11', 'tables' => 20, 'date' => '04/29/2017') ); diff --git a/setup/databaseScripts/drop_database_V0.0.10.sql b/setup/databaseScripts/drop_database_V0.0.11.sql similarity index 95% rename from setup/databaseScripts/drop_database_V0.0.10.sql rename to setup/databaseScripts/drop_database_V0.0.11.sql index ef68960..92113cd 100644 --- a/setup/databaseScripts/drop_database_V0.0.10.sql +++ b/setup/databaseScripts/drop_database_V0.0.11.sql @@ -16,6 +16,7 @@ DROP TABLE IF EXISTS {prefix}payment_code, {prefix}reg_event, {prefix}reg_time, + {prefix}reg_time_pending, {prefix}reg_class, {prefix}reg_rate, {prefix}account, diff --git a/setup/databaseScripts/update_database_V0.0.11.sql b/setup/databaseScripts/update_database_V0.0.11.sql new file mode 100644 index 0000000..6d88580 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.11.sql @@ -0,0 +1,14 @@ +-- Gaslight Media Members Database - Registratiuons Add-On +-- File Created: 08/24/17 09:47:15 +-- Database Version: 0.0.11 +-- 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 + +ALTER TABLE {prefix}account ADD COLUMN validated BOOLEAN; + +---- + +ALTER TABLE {prefix}account ADD COLUMN validation_code TINYTEXT; + diff --git a/views/admin/registrations/eventEdit.html b/views/admin/registrations/eventEdit.html index bd9bab0..40860fa 100644 --- a/views/admin/registrations/eventEdit.html +++ b/views/admin/registrations/eventEdit.html @@ -14,6 +14,11 @@

{$reason}

{else} +

+ Event Registration Settings + Registration Levels & Charges +

+ Return to Dashboard @@ -25,165 +30,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Event Name - - {if $regEvent.fieldFail.event_name}

{$regEvent.fieldFail.event_name}

{/if}
-
Event Registration Code - - {if $regEvent.fieldFail.event_code}

{$regEvent.fieldFail.event_code}

{/if}
-
Notify E-Mail Address - - {if $regEvent.fieldFail.notify_email}

{$regEvent.fieldFail.notify_email}

{/if}
-
Admin Active - - {if $regEvent.fieldFail.admin_active}

{$regEvent.fieldFail.admin_active}

{/if}
-
Date/Time Specific Registrations - - Check this box for events where registrations are for specific dates and times. - {if $regEvent.fieldFail.time_specific}

{$regEvent.fieldFail.time_specific}

{/if}
-
Registrations Active - - {if $regEvent.fieldFail.active}

{$regEvent.fieldFail.active}

{/if}
-
Multiple Attendees per Submission - - {if $regEvent.fieldFail.attendees}

{$regEvent.fieldFail.attendees}

{/if}
-
Maximum # of Attendees - Set to 0 to permit an unlimited number of attendees for this event.
- - {if $regEvent.fieldFail.attendee_max}

{$regEvent.fieldFail.attendee_max}

{/if}
-
Maximum # of Attendees Per Submission - Set to 0 for to permit a user to register an unlimited number of attendees for this event at one time.
- - {if $regEvent.fieldFail.attendee_max_per_reg}

{$regEvent.fieldFail.attendee_max_per_reg}

{/if}
-
Attendees Hold Time (minutes) - When an attendee is added to a registration request, the system will hold that attendee "slot" for this number of minutes - before releasing it for others to register. After the attendee slot is released, the slot will be requested again each - time the selection, cart, or checkout pages are loaded. If there is a slot available at that time, it will again be held - for this amount of time.
- - {if $regEvent.fieldFail.reg_hold_minutes}

{$regEvent.fieldFail.reg_hold_minutes}

{/if}
-
Cart Hold (days) - If the user has registrations entered but has not yet checked out, their "cart" will be maintained for this number of days. - After that time, the card will be deleted. If a user has established a registrations account (entered registrations or - have been registered before, the user will be able log in and continue with the cart up to this number of days.
- - {if $regEvent.fieldFail.cart_hold_days}

{$regEvent.fieldFail.cart_hold_days}

{/if}
-
Account Options - {foreach from=$regEvent.fieldData.registration_account_options.bitmap item=v} - {$v.name}
- {/foreach} - {if $regEvent.fieldFail.registration_account_options}

{$regEvent.fieldFail.registration_account_options}

{/if}
-
Payment Methods - Checking a payment method makes it available for use by regular users at checkout.
- {foreach from=$regEvent.fieldData.payment_methods.bitmap item=v} - {$v.name}
- {/foreach} - {if $regEvent.fieldFail.payment_methods}

{$regEvent.fieldFail.payment_methods}

{/if}
-
Restricted Payment Methods - Restricted payment methods are those only available to logged in administrative users. For example, selecting "No Charge" here - will allow administrative users to check out without having to provide any payment information.
- {foreach from=$regEvent.fieldData.restricted_payment_methods.bitmap item=v} - {$v.name}
- {/foreach} - {if $regEvent.fieldFail.restricted_payment_methods}

{$regEvent.fieldFail.restricted_payment_methods}

{/if}
-
Terms and Conditions for Registration - - {if $regEvent.fieldFail.terms} -

{$regEvent.fieldFail.terms}

- {/if}
-
File - {if $regEvent.fieldData.reg_file} - Replace this file: - {$regEvent.fieldData.reg_file}    - Delete File
- {else} - New file: - {/if} -
File Title - - {if $regEvent.fieldFail.reg_file_title}

{$regEvent.fieldFail.reg_file_title}

{/if}
-
Notes - - {if $regEvent.fieldFail.notes} -

{$regEvent.fieldFail.notes}

- {/if}
-
+NEED TO ADD TESTS FOR CHANGES IN INPUT
+ + {**** General Settings for Event ****} + {include file='admin/registrations/eventEditSettings.html'} - + {**** Registration Levels and Charges for Event ****} + {include file='admin/registrations/eventEditLevels.html'} + +

@@ -192,6 +47,41 @@ + +{/literal} +
+ +
+{* Bootstrap the models needed on page load *} +{* Need to have RegEvent model created *} +{* And create the RegClasses collection *} + + diff --git a/views/admin/registrations/eventEditSettings.html b/views/admin/registrations/eventEditSettings.html new file mode 100644 index 0000000..fef7ce4 --- /dev/null +++ b/views/admin/registrations/eventEditSettings.html @@ -0,0 +1,160 @@ + +{**** General Settings for Event ****} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Event Name + + {if $regEvent.fieldFail.event_name}

{$regEvent.fieldFail.event_name}

{/if}
+
Event Registration Code + + {if $regEvent.fieldFail.event_code}

{$regEvent.fieldFail.event_code}

{/if}
+
Notify E-Mail Address + + {if $regEvent.fieldFail.notify_email}

{$regEvent.fieldFail.notify_email}

{/if}
+
Admin Active + + {if $regEvent.fieldFail.admin_active}

{$regEvent.fieldFail.admin_active}

{/if}
+
Date/Time Specific Registrations + + Check this box for events where registrations are for specific dates and times. + {if $regEvent.fieldFail.time_specific}

{$regEvent.fieldFail.time_specific}

{/if}
+
Registrations Active + + {if $regEvent.fieldFail.active}

{$regEvent.fieldFail.active}

{/if}
+
Multiple Attendees per Submission + + {if $regEvent.fieldFail.attendees}

{$regEvent.fieldFail.attendees}

{/if}
+
Maximum # of Attendees + Set to 0 to permit an unlimited number of attendees for this event.
+ + {if $regEvent.fieldFail.attendee_max}

{$regEvent.fieldFail.attendee_max}

{/if}
+
Maximum # of Attendees Per Submission + Set to 0 for to permit a user to register an unlimited number of attendees for this event at one time.
+ + {if $regEvent.fieldFail.attendee_max_per_reg}

{$regEvent.fieldFail.attendee_max_per_reg}

{/if}
+
Attendees Hold Time (minutes) + When an attendee is added to a registration request, the system will hold that attendee "slot" for this number of minutes + before releasing it for others to register. After the attendee slot is released, the slot will be requested again each + time the selection, cart, or checkout pages are loaded. If there is a slot available at that time, it will again be held + for this amount of time.
+ + {if $regEvent.fieldFail.reg_hold_minutes}

{$regEvent.fieldFail.reg_hold_minutes}

{/if}
+
Cart Hold (days) + If the user has registrations entered but has not yet checked out, their "cart" will be maintained for this number of days. + After that time, the card will be deleted. If a user has established a registrations account (entered registrations or + have been registered before, the user will be able log in and continue with the cart up to this number of days.
+ + {if $regEvent.fieldFail.cart_hold_days}

{$regEvent.fieldFail.cart_hold_days}

{/if}
+
Account Options + {foreach from=$regEvent.fieldData.registration_account_options.bitmap item=v} + {$v.name}
+ {/foreach} + {if $regEvent.fieldFail.registration_account_options}

{$regEvent.fieldFail.registration_account_options}

{/if}
+
Payment Methods + Checking a payment method makes it available for use by regular users at checkout.
+ {foreach from=$regEvent.fieldData.payment_methods.bitmap item=v} + {$v.name}
+ {/foreach} + {if $regEvent.fieldFail.payment_methods}

{$regEvent.fieldFail.payment_methods}

{/if}
+
Restricted Payment Methods + Restricted payment methods are those only available to logged in administrative users. For example, selecting "No Charge" here + will allow administrative users to check out without having to provide any payment information.
+ {foreach from=$regEvent.fieldData.restricted_payment_methods.bitmap item=v} + {$v.name}
+ {/foreach} + {if $regEvent.fieldFail.restricted_payment_methods}

{$regEvent.fieldFail.restricted_payment_methods}

{/if}
+
Terms and Conditions for Registration + + {if $regEvent.fieldFail.terms} +

{$regEvent.fieldFail.terms}

+ {/if}
+
File + {if $regEvent.fieldData.reg_file} + Replace this file: + {$regEvent.fieldData.reg_file}    + Delete File
+ {else} + New file: + {/if} +
File Title + + {if $regEvent.fieldFail.reg_file_title}

{$regEvent.fieldFail.reg_file_title}

{/if}
+
Notes + + {if $regEvent.fieldFail.notes} +

{$regEvent.fieldFail.notes}

+ {/if}
+
diff --git a/views/admin/registrations/header.html b/views/admin/registrations/header.html index 3cc1773..11f6006 100644 --- a/views/admin/registrations/header.html +++ b/views/admin/registrations/header.html @@ -1,12 +1,5 @@

Event Registrations

-

- Registrations Dashboard - Registration Events List - Selected Event Dashboard - Registration Requests - Account List -

-- 2.17.1