From 8dd4275db6ad83e04806b3f7729e9aa1a4782bd4 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Fri, 2 Feb 2018 16:58:08 -0500 Subject: [PATCH] Added terms for "level" to management and updated database. --- classes/data/dataSettingsTerms.php | 32 ++ index.php | 2 +- ...0.0.24.sql => create_database_V0.0.25.sql} | 4 + setup/databaseScripts/dbVersions.php | 3 +- ..._V0.0.24.sql => drop_database_V0.0.25.sql} | 0 .../update_database_V0.0.24.sql | 2 +- .../update_database_V0.0.25.sql | 26 ++ views/admin/management/regterms.html | 402 ++++++++++-------- views/front/registrations/cartSummary.html | 6 +- 9 files changed, 304 insertions(+), 173 deletions(-) rename setup/databaseScripts/{create_database_V0.0.24.sql => create_database_V0.0.25.sql} (99%) rename setup/databaseScripts/{drop_database_V0.0.24.sql => drop_database_V0.0.25.sql} (100%) create mode 100644 setup/databaseScripts/update_database_V0.0.25.sql diff --git a/classes/data/dataSettingsTerms.php b/classes/data/dataSettingsTerms.php index 0a5c30e..955e80e 100644 --- a/classes/data/dataSettingsTerms.php +++ b/classes/data/dataSettingsTerms.php @@ -412,6 +412,38 @@ class GlmDataRegistrationsSettingsTerms extends GlmDataAbstract 'use' => 'a' ), + // Term for level + 'reg_term_level' => array ( + 'field' => 'reg_term_level', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for Level (cap) + 'reg_term_level_cap' => array ( + 'field' => 'reg_term_level_cap', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for levels (plur) + 'reg_term_level_plur' => array ( + 'field' => 'reg_term_level_plur', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for Levels (plur, cap) + 'reg_term_level_plur_cap' => array ( + 'field' => 'reg_term_level_plur_cap', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + // Term for payment code 'reg_term_payment_code' => array ( 'field' => 'reg_term_payment_code', diff --git a/index.php b/index.php index cdcfda3..ac79f4f 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.24'); +define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.25'); // 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.17'); diff --git a/setup/databaseScripts/create_database_V0.0.24.sql b/setup/databaseScripts/create_database_V0.0.25.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.0.24.sql rename to setup/databaseScripts/create_database_V0.0.25.sql index df14a94..08d1c80 100644 --- a/setup/databaseScripts/create_database_V0.0.24.sql +++ b/setup/databaseScripts/create_database_V0.0.25.sql @@ -135,6 +135,10 @@ CREATE TABLE {prefix}settings_terms ( reg_term_id_cap TINYTEXT NULL, reg_term_id_plur TINYTEXT NULL, reg_term_id_plur_cap TINYTEXT NULL, + reg_term_level TINYTEXT NULL, + reg_term_level_cap TINYTEXT NULL, + reg_term_level_plur TINYTEXT NULL, + reg_term_level_plur_cap TINYTEXT NULL, reg_term_password TINYTEXT NULL, reg_term_password_cap TINYTEXT NULL, reg_term_password_plur TINYTEXT NULL, diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index e2378c6..1abc662 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -37,7 +37,8 @@ $glmMembersRegistrationsDbVersions = array( '0.0.21' => array('version' => '0.0.21', 'tables' => 17, 'date' => '01/08/2018'), '0.0.22' => array('version' => '0.0.22', 'tables' => 17, 'date' => '01/09/2018'), '0.0.23' => array('version' => '0.0.23', 'tables' => 18, 'date' => '01/19/2018'), - '0.0.24' => array('version' => '0.0.24', 'tables' => 18, 'date' => '01/19/2018') + '0.0.24' => array('version' => '0.0.24', 'tables' => 18, 'date' => '01/19/2018'), + '0.0.25' => array('version' => '0.0.25', 'tables' => 18, 'date' => '02/02/2018') ); diff --git a/setup/databaseScripts/drop_database_V0.0.24.sql b/setup/databaseScripts/drop_database_V0.0.25.sql similarity index 100% rename from setup/databaseScripts/drop_database_V0.0.24.sql rename to setup/databaseScripts/drop_database_V0.0.25.sql diff --git a/setup/databaseScripts/update_database_V0.0.24.sql b/setup/databaseScripts/update_database_V0.0.24.sql index cae378c..bc907e2 100644 --- a/setup/databaseScripts/update_database_V0.0.24.sql +++ b/setup/databaseScripts/update_database_V0.0.24.sql @@ -1,6 +1,6 @@ -- Gaslight Media Members Database - Registratiuons Add-On -- File Created: 2018-01-19 --- Database Version: 0.0.23 +-- Database Version: 0.0.24 -- Database Update From Previous Version Script -- -- To permit each query below to be executed separately, diff --git a/setup/databaseScripts/update_database_V0.0.25.sql b/setup/databaseScripts/update_database_V0.0.25.sql new file mode 100644 index 0000000..28c7dc9 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.25.sql @@ -0,0 +1,26 @@ +-- Gaslight Media Members Database - Registratiuons Add-On +-- File Created: 2018-02-02 +-- Database Version: 0.0.25 +-- 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}settings_terms ADD COLUMN reg_term_level TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_level_cap TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_level_plur TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_level_plur_cap TINYTEXT; + +---- + +UPDATE {prefix}settings_terms SET reg_term_level = 'level', reg_term_level_cap = 'Level', reg_term_level_plur = 'levels', reg_term_level_plur_cap = 'Levels' WHERE ID = 1; + diff --git a/views/admin/management/regterms.html b/views/admin/management/regterms.html index 2149a7c..446251d 100644 --- a/views/admin/management/regterms.html +++ b/views/admin/management/regterms.html @@ -19,6 +19,9 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -146,55 +63,38 @@ {if $termSettings.fieldFail.reg_term_attendee_plur_cap}

{$termSettings.fieldFail.reg_term_attendee_plur_cap}

{/if} + + - - - - - - - + + + + - - - - - - - - - - - - - + + + + - - - + + - + + @@ -227,8 +127,8 @@ {if $termSettings.fieldFail.reg_term_event_plur_cap}

{$termSettings.fieldFail.reg_term_event_plur_cap}

{/if} - - + + @@ -261,38 +161,8 @@ {if $termSettings.fieldFail.reg_term_id_plur_cap}

{$termSettings.fieldFail.reg_term_id_plur_cap}

{/if} - - - - - - - - - - - - - - - - - - - - + + @@ -325,8 +195,78 @@ {if $termSettings.fieldFail.reg_term_instructor_plur_cap}

{$termSettings.fieldFail.reg_term_instructor_plur_cap}

{/if} + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Application Title: @@ -26,94 +29,8 @@ {if $termSettings.fieldFail.reg_term_registrations_name}

{$termSettings.fieldFail.reg_term_registrations_name}

{/if}
Registration:Normal: - - {if $termSettings.fieldFail.reg_term_registration}

{$termSettings.fieldFail.reg_term_registration}

{/if} -
 Capitalized: - - {if $termSettings.fieldFail.reg_term_registration_cap}

{$termSettings.fieldFail.reg_term_registration_cap}

{/if} -
 Plural: - - {if $termSettings.fieldFail.reg_term_registration_plur}

{$termSettings.fieldFail.reg_term_registration_plur}

{/if} -
 Plural Capitalized - - {if $termSettings.fieldFail.reg_term_registration_plur_cap}

{$termSettings.fieldFail.reg_term_registration_plur_cap}

{/if} -
Register:Normal: - - {if $termSettings.fieldFail.reg_term_register}

{$termSettings.fieldFail.reg_term_register}

{/if} -
 Capitalized: - - {if $termSettings.fieldFail.reg_term_register_cap}

{$termSettings.fieldFail.reg_term_register_cap}

{/if} -
 Registers: - - {if $termSettings.fieldFail.reg_term_registers}

{$termSettings.fieldFail.reg_term_registers}

{/if} -
 Registering: - - {if $termSettings.fieldFail.reg_term_registering}

{$termSettings.fieldFail.reg_term_registering}

{/if} -
 Registering Capitalized: - - {if $termSettings.fieldFail.reg_term_registering_cap}

{$termSettings.fieldFail.reg_term_registering_cap}

{/if} -
 Registered: - - {if $termSettings.fieldFail.reg_term_registered}

{$termSettings.fieldFail.reg_term_registered}

{/if} -
 Registered Capitalized: - - {if $termSettings.fieldFail.reg_term_registered_cap}

{$termSettings.fieldFail.reg_term_registered_cap}

{/if} -
Attendee: Normal:
 Attending: - - {if $termSettings.fieldFail.reg_term_attending}

{$termSettings.fieldFail.reg_term_attending}

{/if} -
 Attended:Attended:Normal: {if $termSettings.fieldFail.reg_term_attended}

{$termSettings.fieldFail.reg_term_attended}

{/if}
Registered User:Normal: - - {if $termSettings.fieldFail.reg_term_registered_user}

{$termSettings.fieldFail.reg_term_registered_user}

{/if} -
 Capitalized: - - {if $termSettings.fieldFail.reg_term_registered_user_cap}

{$termSettings.fieldFail.reg_term_registered_user_cap}

{/if} -
 Plural: - - {if $termSettings.fieldFail.reg_term_registered_user_plur}

{$termSettings.fieldFail.reg_term_registered_user_plur}

{/if} +
Attending:Normal: + + {if $termSettings.fieldFail.reg_term_attending}

{$termSettings.fieldFail.reg_term_attending}

{/if}
 Plural Capitalized: - - {if $termSettings.fieldFail.reg_term_registered_user_plur_cap}

{$termSettings.fieldFail.reg_term_registered_user_plur_cap}

{/if} +
Contact Information:Normal: + + {if $termSettings.fieldFail.reg_term_contact_information}

{$termSettings.fieldFail.reg_term_contact_information}

{/if}
Event: Normal:
ID: Normal:
Password:Normal: - - {if $termSettings.fieldFail.reg_term_password}

{$termSettings.fieldFail.reg_term_password}

{/if} -
 Capitalized: - - {if $termSettings.fieldFail.reg_term_password_cap}

{$termSettings.fieldFail.reg_term_password_cap}

{/if} -
 Plural: - - {if $termSettings.fieldFail.reg_term_password_plur}

{$termSettings.fieldFail.reg_term_password_plur}

{/if} -
 Plural Capitalized: - - {if $termSettings.fieldFail.reg_term_password_plur_cap}

{$termSettings.fieldFail.reg_term_password_plur_cap}

{/if} -
Instructor: Normal:
Level:Normal: + + {if $termSettings.fieldFail.reg_term_level}

{$termSettings.fieldFail.reg_term_level}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_level_cap}

{$termSettings.fieldFail.reg_term_level_cap}

{/if} +
{$terms.reg_term_payment_code_cap}: Plural: + + {if $termSettings.fieldFail.reg_term_level_plur}

{$termSettings.fieldFail.reg_term_level_plur}

{/if} +
 Plural Capitalized: + + {if $termSettings.fieldFail.reg_term_level_plur_cap}

{$termSettings.fieldFail.reg_term_level_plur_cap}

{/if} +
Password:Normal: + + {if $termSettings.fieldFail.reg_term_password}

{$termSettings.fieldFail.reg_term_password}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_password_cap}

{$termSettings.fieldFail.reg_term_password_cap}

{/if} +
 Plural: + + {if $termSettings.fieldFail.reg_term_password_plur}

{$termSettings.fieldFail.reg_term_password_plur}

{/if} +
 Plural Capitalized: + + {if $termSettings.fieldFail.reg_term_password_plur_cap}

{$termSettings.fieldFail.reg_term_password_plur_cap}

{/if} +
Payment Code: Normal: @@ -357,22 +297,150 @@ {if $termSettings.fieldFail.reg_term_payment_code_plur_cap}

{$termSettings.fieldFail.reg_term_payment_code_plur_cap}

{/if}
Other Terms:Contact Information - - {if $termSettings.fieldFail.reg_term_contact_information}

{$termSettings.fieldFail.reg_term_contact_information}

{/if} +
Register:Normal: + + {if $termSettings.fieldFail.reg_term_register}

{$termSettings.fieldFail.reg_term_register}

{/if}
 {$terms.reg_term_registration_button}:Capitalized: + + {if $termSettings.fieldFail.reg_term_register_cap}

{$termSettings.fieldFail.reg_term_register_cap}

{/if} +
Register for EventNormal: {if $termSettings.fieldFail.reg_term_registration_button}

{$termSettings.fieldFail.reg_term_registration_button}

{/if}
Registered;Normal: + + {if $termSettings.fieldFail.reg_term_registered}

{$termSettings.fieldFail.reg_term_registered}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_registered_cap}

{$termSettings.fieldFail.reg_term_registered_cap}

{/if} +
Registered User:Normal: + + {if $termSettings.fieldFail.reg_term_registered_user}

{$termSettings.fieldFail.reg_term_registered_user}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_registered_user_cap}

{$termSettings.fieldFail.reg_term_registered_user_cap}

{/if} +
 Plural: + + {if $termSettings.fieldFail.reg_term_registered_user_plur}

{$termSettings.fieldFail.reg_term_registered_user_plur}

{/if} +
 Plural Capitalized: + + {if $termSettings.fieldFail.reg_term_registered_user_plur_cap}

{$termSettings.fieldFail.reg_term_registered_user_plur_cap}

{/if} +
RegisteringNormal: + + {if $termSettings.fieldFail.reg_term_registering}

{$termSettings.fieldFail.reg_term_registering}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_registering_cap}

{$termSettings.fieldFail.reg_term_registering_cap}

{/if} +
Registers: Normal: + + {if $termSettings.fieldFail.reg_term_registers}

{$termSettings.fieldFail.reg_term_registers}

{/if} + (Intransitive Verb) +
Registration:Normal: + + {if $termSettings.fieldFail.reg_term_registration}

{$termSettings.fieldFail.reg_term_registration}

{/if} +
 Capitalized: + + {if $termSettings.fieldFail.reg_term_registration_cap}

{$termSettings.fieldFail.reg_term_registration_cap}

{/if} +
 Plural: + + {if $termSettings.fieldFail.reg_term_registration_plur}

{$termSettings.fieldFail.reg_term_registration_plur}

{/if} +
 Plural Capitalized + + {if $termSettings.fieldFail.reg_term_registration_plur_cap}

{$termSettings.fieldFail.reg_term_registration_plur_cap}

{/if} +
diff --git a/views/front/registrations/cartSummary.html b/views/front/registrations/cartSummary.html index fab99e6..98d869f 100644 --- a/views/front/registrations/cartSummary.html +++ b/views/front/registrations/cartSummary.html @@ -8,7 +8,7 @@ {/if}
{foreach $cart.events as $event} - +{debug}
@@ -34,16 +34,16 @@
{foreach $event.classes as $class} + {foreach $class.rates as $rate}
{$terms.reg_term_registration_cap} Level: {$class.class_name}
- Charges + {if $rate.rateBaseCharge > 0}{$rate.base_rate_money}{/if}
- {foreach $class.rates as $rate} {if $rate.rateBaseCharge > 0}