From c9b7ae18d83df29f5c44725c6b967a469ff00a65 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 23 Jan 2018 14:21:37 -0500 Subject: [PATCH] Added new "terms" to management, fixed errors & warnings, updated UI. Removed unused view parameter defaultCalDate causing undefined variable error and associated defaultDate jQuery parameter in dataRegEvent.php. Fixed bad changes to Registered count output in eventDashboard.html. Added code to eventRegistrants.html to make links show on hover and cleaned up appearance. Fixed max attendee parameter not found problem in eventDashboard.html Added new "terms" to database and replaced occurrances of those words with terms refernce in view files. Cleared up some undefined references in various views. --- classes/data/dataRegEvent.php | 28 ++--- classes/data/dataSettingsTerms.php | 32 ++++++ index.php | 2 +- models/admin/ajax/regAdmin/attendee.php | 3 - models/admin/registrations/events.php | 1 - .../registrations/events_eventDashboard.php | 2 +- setup/adminMenus.php | 14 +-- ...0.0.23.sql => create_database_V0.0.24.sql} | 4 + setup/databaseScripts/dbVersions.php | 1 + ..._V0.0.22.sql => drop_database_V0.0.24.sql} | 0 .../update_database_V0.0.24.sql | 25 +++++ views/admin/management/regterms.html | 35 ++++++ .../admin/registrations/accountDashboard.html | 4 +- views/admin/registrations/accountHeader.html | 2 +- .../registrations/accountsDashboard.html | 8 +- views/admin/registrations/eventDashboard.html | 84 ++++++++------- views/admin/registrations/eventEdit.html | 29 ++--- .../registrations/eventEditCustomFields.html | 16 +-- .../admin/registrations/eventEditLevels.html | 22 ++-- .../registrations/eventEditNotification.html | 14 +-- views/admin/registrations/eventHeader.html | 2 +- .../registrations/eventPaymentCodes.html | 8 +- .../admin/registrations/eventRegistrants.html | 100 +++++++++++------- views/admin/registrations/eventSubTabs.html | 2 +- .../admin/registrations/eventsDashboard.html | 14 +-- .../registrationEventDeleted.html | 2 +- views/admin/registrations/requestEdit.html | 2 +- views/admin/registrations/requestHeader.html | 2 +- views/admin/settings/registrationsMisc.html | 2 +- views/front/registrations/accountHeader.html | 4 +- views/front/registrations/cartLinkWidget.html | 2 +- views/front/registrations/checkout.html | 4 +- views/front/registrations/header.html | 2 +- views/front/registrations/list.html | 2 +- 34 files changed, 299 insertions(+), 175 deletions(-) rename setup/databaseScripts/{create_database_V0.0.23.sql => create_database_V0.0.24.sql} (99%) rename setup/databaseScripts/{drop_database_V0.0.22.sql => drop_database_V0.0.24.sql} (100%) create mode 100644 setup/databaseScripts/update_database_V0.0.24.sql diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php index 25db4db..198eb65 100644 --- a/classes/data/dataRegEvent.php +++ b/classes/data/dataRegEvent.php @@ -149,8 +149,8 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract 'event_name' => array ( 'field' => 'event_name', 'type' => 'text', - 'required' => false, - 'use' => 'lgned' + 'required' => true, + 'use' => 'lgnedu' ), // A short code used to reference this event @@ -751,20 +751,24 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract // Get the first and last times in the reg_times entries $firstTime = false; $lastTime = false; - foreach ($this->regEventData['reg_time'] as $time) { - // If the time is not for non-time-specific inventory - if (!$time['non_time_specific']['value']) { + // Check for reg_time data (are we still using this?) + if (is_array($this->regEventData['reg_time']) && count($this->regEventData['reg_time']) > 0) { + foreach ($this->regEventData['reg_time'] as $time) { + + // If the time is not for non-time-specific inventory + if (!$time['non_time_specific']['value']) { + + if (!$firstTime || $time['start_datetime']['timestamp'] < $firstTime) { + $firstTime = $time['start_datetime']['timestamp']; + } + if (!$lastTime || $time['start_datetime']['timestamp'] > $lastTime) { + $lastTime = $time['start_datetime']['timestamp']; + } - if (!$firstTime || $time['start_datetime']['timestamp'] < $firstTime) { - $firstTime = $time['start_datetime']['timestamp']; - } - if (!$lastTime || $time['start_datetime']['timestamp'] > $lastTime) { - $lastTime = $time['start_datetime']['timestamp']; } } - } // Generate date as used in results @@ -796,7 +800,7 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract } // If this is a non-time-specific event - if ($time['non_time_specific']) { + if (!$this->regEventData['time_specific']) { // Find the non-time-specific time entry foreach ($this->regEventData['reg_time'] as $regTimeKey=>$regTime) { diff --git a/classes/data/dataSettingsTerms.php b/classes/data/dataSettingsTerms.php index af6dc8e..0a5c30e 100644 --- a/classes/data/dataSettingsTerms.php +++ b/classes/data/dataSettingsTerms.php @@ -284,6 +284,38 @@ class GlmDataRegistrationsSettingsTerms extends GlmDataAbstract 'use' => 'a' ), + // Term for event + 'reg_term_event' => array ( + 'field' => 'reg_term_event', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for Event (cap) + 'reg_term_event_cap' => array ( + 'field' => 'reg_term_event_cap', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for events (plur) + 'reg_term_event_plur' => array ( + 'field' => 'reg_term_event_plur', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Term for Events (plur, cap) + 'reg_term_event_plur_cap' => array ( + 'field' => 'reg_term_event_plur_cap', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + // Term for ID 'reg_term_id' => array ( 'field' => 'reg_term_id', diff --git a/index.php b/index.php index a6e7f6f..cdcfda3 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.23'); +define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.24'); // 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/models/admin/ajax/regAdmin/attendee.php b/models/admin/ajax/regAdmin/attendee.php index 289532c..7ce938e 100644 --- a/models/admin/ajax/regAdmin/attendee.php +++ b/models/admin/ajax/regAdmin/attendee.php @@ -81,9 +81,6 @@ class GlmMembersAdmin_registrations_ajax_attendee // extends GlmDataRegistration public function modelAction($modelData) { - trigger_error( print_r( $modelData, true ) ); - - // Perform specified action switch ($modelData['option']) { diff --git a/models/admin/registrations/events.php b/models/admin/registrations/events.php index 0b3d5bc..ff7cf91 100644 --- a/models/admin/registrations/events.php +++ b/models/admin/registrations/events.php @@ -211,7 +211,6 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent 'haveRegEvent' => $haveRegEvent, 'haveRegEventRecurrences' => $haveRegEventRecurrences, 'haveRegEventTimes' => $haveRegEventTimes, - 'defaultCalDate' => date('Y-m-d H:i:s', $defaultCalTime), 'regEventFirstTime' => $regEventFirstTime, 'regEventLastTime' => $regEventLastTime, 'regEventUpdated' => $regEventUpdated, diff --git a/models/admin/registrations/events_eventDashboard.php b/models/admin/registrations/events_eventDashboard.php index 893c207..ec9a7c1 100644 --- a/models/admin/registrations/events_eventDashboard.php +++ b/models/admin/registrations/events_eventDashboard.php @@ -51,7 +51,7 @@ if ($regEvent !== false) { } // Check if we have any times for this reg_event -if (is_array($regEvent['reg_time']) || count($regEVent['reg_time']) > 0) { +if (is_array($regEvent['reg_time']) || count($regEvent['reg_time']) > 0) { $haveRegEventTimes = true; } else { $messages[] = 'There are no dates for registrations for this event.'; diff --git a/setup/adminMenus.php b/setup/adminMenus.php index f79fc0b..d0fa0a3 100644 --- a/setup/adminMenus.php +++ b/setup/adminMenus.php @@ -52,16 +52,16 @@ add_submenu_page( 'glm-members-admin-menu-members', - 'Registrations', - 'Registrations', + $this->config['terms']['reg_term_registration_plur_cap'], + $this->config['terms']['reg_term_registration_plur_cap'], 'glm_members_members', 'glm-members-admin-menu-registrations-index', function() {$this->controller('registrations', 'events');} ); add_submenu_page( 'glm-members-admin-menu-members', - 'Selected Event', - '    Events', + 'Selected '.$this->config['terms']['reg_term_event_cap'], + '    '.$this->config['terms']['reg_term_event_plur_cap'], 'glm_members_members', 'glm-members-admin-menu-registrations-events', function() {$this->controller('registrations', 'events');} @@ -69,7 +69,7 @@ add_submenu_page( add_submenu_page( 'glm-members-admin-menu-members', - 'Registration Requests', + $this->config['terms']['reg_term_registration_cap'].' Requests', '    Requests', 'glm_members_members', 'glm-members-admin-menu-registrations-requests', @@ -77,7 +77,7 @@ add_submenu_page( ); add_submenu_page( 'glm-members-admin-menu-members', - 'Registration Accounts', + $this->config['terms']['reg_term_registration_cap'].' Accounts', '    Accounts', 'glm_members_members', 'glm-members-admin-menu-registrations-accounts', @@ -85,7 +85,7 @@ add_submenu_page( ); add_submenu_page( 'glm-members-admin-menu-members', - 'Registration Reports', + $this->config['terms']['reg_term_registration_cap'].' Reports', '    Reports', 'glm_members_members', 'glm-members-admin-menu-registrations-reports', diff --git a/setup/databaseScripts/create_database_V0.0.23.sql b/setup/databaseScripts/create_database_V0.0.24.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.0.23.sql rename to setup/databaseScripts/create_database_V0.0.24.sql index e396ee8..df14a94 100644 --- a/setup/databaseScripts/create_database_V0.0.23.sql +++ b/setup/databaseScripts/create_database_V0.0.24.sql @@ -661,6 +661,10 @@ INSERT INTO {prefix}settings_terms reg_term_registered_user_cap, reg_term_registered_user_plur, reg_term_registered_user_plur_cap, + reg_term_event, + reg_term_event_cap, + reg_term_event_plur, + reg_term_event_plur_cap, reg_term_id, reg_term_id_cap, reg_term_id_plur, diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 2ae18f1..e2378c6 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -37,6 +37,7 @@ $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') ); diff --git a/setup/databaseScripts/drop_database_V0.0.22.sql b/setup/databaseScripts/drop_database_V0.0.24.sql similarity index 100% rename from setup/databaseScripts/drop_database_V0.0.22.sql rename to setup/databaseScripts/drop_database_V0.0.24.sql diff --git a/setup/databaseScripts/update_database_V0.0.24.sql b/setup/databaseScripts/update_database_V0.0.24.sql new file mode 100644 index 0000000..cae378c --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.24.sql @@ -0,0 +1,25 @@ +-- Gaslight Media Members Database - Registratiuons Add-On +-- File Created: 2018-01-19 +-- Database Version: 0.0.23 +-- 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_event TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_event_cap TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_event_plur TINYTEXT; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_event_plur_cap TINYTEXT; + +---- + +UPDATE {prefix}settings_terms SET reg_term_event = 'event', reg_term_event_cap = 'Event', reg_term_event_plur = 'events', reg_term_event_plur_cap = 'Events' WHERE id = 1; diff --git a/views/admin/management/regterms.html b/views/admin/management/regterms.html index 931d18c..2149a7c 100644 --- a/views/admin/management/regterms.html +++ b/views/admin/management/regterms.html @@ -194,6 +194,41 @@ {if $termSettings.fieldFail.reg_term_registered_user_plur_cap}

{$termSettings.fieldFail.reg_term_registered_user_plur_cap}

{/if} + + + Event: + Normal: + + + {if $termSettings.fieldFail.reg_term_event}

{$termSettings.fieldFail.reg_term_event}

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

{$termSettings.fieldFail.reg_term_event_cap}

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

{$termSettings.fieldFail.reg_term_event_plur}

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

{$termSettings.fieldFail.reg_term_event_plur_cap}

{/if} + + + + ID: Normal: diff --git a/views/admin/registrations/accountDashboard.html b/views/admin/registrations/accountDashboard.html index 700cab8..299570b 100644 --- a/views/admin/registrations/accountDashboard.html +++ b/views/admin/registrations/accountDashboard.html @@ -97,12 +97,12 @@
-

{$terms.reg_term_registered} for Events

+

{$terms.reg_term_registered} for {$terms.reg_term_event_plur_cap}

{assign var="i" value="0"} - + diff --git a/views/admin/registrations/accountHeader.html b/views/admin/registrations/accountHeader.html index e9dbcee..1bca9da 100644 --- a/views/admin/registrations/accountHeader.html +++ b/views/admin/registrations/accountHeader.html @@ -1,5 +1,5 @@
-

Event {$terms.reg_term_registration_plur_cap}

+

{$terms.reg_term_event_cap} {$terms.reg_term_registration_plur_cap}

Dashboard Last Selected Account diff --git a/views/admin/registrations/accountsDashboard.html b/views/admin/registrations/accountsDashboard.html index 37bd679..2b461d3 100644 --- a/views/admin/registrations/accountsDashboard.html +++ b/views/admin/registrations/accountsDashboard.html @@ -25,8 +25,8 @@

Total found: {$numAccounts}  

{if $paging && $numAccounts} - - + + {/if} {if $hasAccounts} @@ -72,8 +72,8 @@ {/if} {if $paging && $numAccounts} - - + + {/if} diff --git a/views/admin/registrations/eventDashboard.html b/views/admin/registrations/eventDashboard.html index 00c499c..01679ba 100644 --- a/views/admin/registrations/eventDashboard.html +++ b/views/admin/registrations/eventDashboard.html @@ -8,7 +8,7 @@
-

Event Code:

+

{$terms.reg_term_event_cap} Code:

{$regEvent.event_code} @@ -16,7 +16,7 @@
-

First Event Time:

+

First {$terms.reg_term_event_cap} Time:

{$regEventFirstTime.datetime} @@ -24,7 +24,7 @@
-

Last Event Time:

+

Last {$terms.reg_term_event_cap} Time:

{$regEventLastTime.datetime} @@ -46,10 +46,10 @@ {/if}
-

{$terms.reg_term_registered}:

+

{$terms.reg_term_registered_cap}:

- {$regEvent.registered_cap} + {$regEvent.registered}
{if $haveRegEvent} @@ -91,21 +91,21 @@
-
Add {$terms.reg_term_registration_cap} Dates/Times from Event
-
+
Add {$terms.reg_term_registration_cap} Dates/Times from {$terms.reg_term_event_cap}
+

- This action looks for dates and time specified for the associated event in the event schedules. If there are any dates and times that are - not already included for {$terms.reg_term_registration_plur}, this action will add them using the defaults set for this event. You may set those - defaults by clicking the "Edit {$terms.reg_term_registration_cap} Event" button on this page. This action will not modify or remove date and times already - added to {$terms.reg_term_registration_plur} for this event. + This action looks for dates and time specified for the associated {$terms.reg_term_event} in the {$terms.reg_term_event} schedules. If there are any dates and times that are + not already included for {$terms.reg_term_registration_plur}, this action will add them using the defaults set for this {$terms.reg_term_event}. You may set those + defaults by clicking the "Edit {$terms.reg_term_registration_cap} {$terms.reg_term_event_cap}" button on this page. This action will not modify or remove date and times already + added to {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}.

- The primary purpose of this action is to assist with initial setup of {$terms.reg_term_registration_plur} for an event when there are a number of - dates and times specified in the schedules for the event and you wish to make most or all of those dates and times available for {$terms.reg_term_registration}. + The primary purpose of this action is to assist with initial setup of {$terms.reg_term_registration_plur} for an {$terms.reg_term_event} when there are a number of + dates and times specified in the schedules for the {$terms.reg_term_event} and you wish to make most or all of those dates and times available for {$terms.reg_term_registration}.

- NOTE: If the event covers a large number of dates, this action may add a large number of dates - and times to {$terms.reg_term_registration_plur} for this event. To deactivate or remove those dates you will be required to click on each date/time + NOTE: If the {$terms.reg_term_event} covers a large number of dates, this action may add a large number of dates + and times to {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}. To deactivate or remove those dates you will be required to click on each date/time and either deactivate it or demove it.

@@ -115,11 +115,11 @@
-

Event: {$regEvent.event_name}

-

To add dates and times from the event schedules
enter exactly "ADD" in the field below.

+

{$terms.reg_term_event_cap}: {$regEvent.event_name}

+

To add dates and times from the {$terms.reg_term_event} schedules
enter exactly "ADD" in the field below.

Then click this button

- +
@@ -130,35 +130,35 @@
-
Delete {$terms.reg_term_registration_cap} Event
-
+
Delete {$terms.reg_term_registration_cap} {$terms.reg_term_event_cap}
+

WARNING!

-

*** Entirely removes an Event from {$terms.reg_term_registration_plur_cap} ***

+

*** Entirely removes an {$terms.reg_term_event_cap} from {$terms.reg_term_registration_plur_cap} ***

- Continuing with this action will permanently remove this event from {$terms.reg_term_registration_plur} including all configuration associated with it. - This will not remove the event listing, only the information on {$terms.reg_term_registration_plur} for this event. + Continuing with this action will permanently remove this {$terms.reg_term_event} from {$terms.reg_term_registration_plur} including all configuration associated with it. + This will not remove the {$terms.reg_term_event} listing, only the information on {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}.

This action is NOT REVERSABLE! After deletion, you will be required to re-enter all {$terms.reg_term_registration} related - configuration information in order to have {$terms.reg_term_registration_plur} for this event. + configuration information in order to have {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}.

{if $regEvent.registered > 0}

ALSO NOTE!

-

There have been {$regEvent.registered} {$terms.reg_term_registration_plur} submitted for this event.

+

There have been {$regEvent.registered} {$terms.reg_term_registration_plur} submitted for this {$terms.reg_term_event}.

- Continuing with this action will delete all {$terms.reg_term_registration_plur} for this event. + Continuing with this action will delete all {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}. This will also remove these {$terms.reg_term_registration_plur} from all reports. It's important that you print all reports and other information - you want to preserve for {$terms.reg_term_registration_plur} for this event prior to deletion. + you want to preserve for {$terms.reg_term_registration_plur} for this {$terms.reg_term_event} prior to deletion.

The only exception is that the {$terms.reg_term_registration} request records will remain along with the summary that was displayed after checkout for those requests. After this action, that will be the only historic record the the submission took place and it will not be - possible to search for these requests by event. + possible to search for these requests by {$terms.reg_term_event}.

{/if}
@@ -167,11 +167,11 @@
-

Event: {$regEvent.event_name}

-

To delete {$terms.reg_term_registration_plur} for this event, enter exactly "DELETE" in the field below.

+

{$terms.reg_term_event_cap}: {$regEvent.event_name}

+

To delete {$terms.reg_term_registration_plur} for this {$terms.reg_term_event}, enter exactly "DELETE" in the field below.

Then click this button

- +
@@ -193,7 +193,7 @@ {/if}
{else} -

Did not find selected event.

+

Did not find selected {$terms.reg_term_event}.

{/if}
@@ -201,15 +201,15 @@
{if $haveRegEvent}

Dates and Availability

-

Event occurs every day from first day to last day at the times shown.

+

{$terms.reg_term_event_cap} occurs every day from first day to last day at the times shown.

Event Name{$terms.reg_term_event_cap} Name Date/Time
{foreach $regEvent.reg_time as $rt} {if !$regEvent.time_specific.value && $rt.non_time_specific.value} - + {if $rt.attendee_max == 0} {/if} - +

Edit {$terms.reg_term_attendee} availability here for this event.

Edit {$terms.reg_term_attendee} availability here for this {$terms.reg_term_event}.

Unlimited {$terms.reg_term_registration} - Set maximum {$terms.reg_term_attendee_plur} quantity below to limit {$terms.reg_term_registration_plur}.
Limited availability for this event - the below numbers are for all days.
Limited availability for this {$terms.reg_term_event} - the below numbers are for all days.
Maximum {$terms.reg_term_attendee_plur_cap}:
Upate
@@ -222,7 +222,7 @@ {/foreach}
{if $regEvent.time_specific.value} -

Edit {$terms.reg_term_attendee} availability for a specific date/time by clicking event time in the calendar below.

+

Edit {$terms.reg_term_attendee} availability for a specific date/time by clicking {$terms.reg_term_event} time in the calendar below.

Availability guide: (limit)-(registered)-(pending)-(available)

{/if} @@ -235,7 +235,7 @@ {else} -

Did not find selected event.

+

Did not find selected {$terms.reg_term_event}.

{/if}
@@ -463,9 +463,9 @@ // If response was not a possible time ID newEvent.timeId = parseInt(newTimeId); -console.log(newEvent); + if (newEvent.timeId == '0') { - alert('New event date/time may not have been stored properly. Reload page to check.'); + alert('New {$terms.reg_term_event} date/time may not have been stored properly. Reload page to check.'); } else { // Should have good time ID, so add it to the calendar $('#eventCalendar').fullCalendar('renderEvent', newEvent, true); @@ -483,7 +483,6 @@ console.log(newEvent); eventMouseover : function(event, jsEvent, view) { $('.fc-event').css( 'cursor', 'pointer' ); }, - defaultDate : '{$defaultCalDate}', timeFormat : 'h:mma', fixedWeekCount : false, @@ -552,8 +551,11 @@ console.log(newEvent); var start = calEvent.start.format('YYYY/MM/DD') + ' ' + $('#dialogStartTime').val(); var end = calEvent.start.format('YYYY/MM/DD') + ' ' + $('#dialogEndTime').val(); - + {if $regEvent.time_specific.value} var max = $('#dialogMaxAtt').val(); + {else} + var max = 0; + {/if} var timeId = $('#dialogAvailSubmit').attr('data-timeid'); // Make sure we have required data diff --git a/views/admin/registrations/eventEdit.html b/views/admin/registrations/eventEdit.html index ed56f98..654dd63 100644 --- a/views/admin/registrations/eventEdit.html +++ b/views/admin/registrations/eventEdit.html @@ -2,9 +2,9 @@ {include file='admin/registrations/eventSubTabs.html'}

- {if $regEventUpdated}{$terms.reg_term_registration_cap} Event Updated{/if} - {if $regEventUpdateError}{$terms.reg_term_registration_cap} Event Update Error{/if} - {if $regEventAdded}{$terms.reg_term_registration_cap} Event Added{/if} + {if $regEventUpdated}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Updated{/if} + {if $regEventUpdateError}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Update Error{/if} + {if $regEventAdded}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Added{/if}

(Items in red are required)

@@ -17,13 +17,16 @@
- - + - + @@ -55,7 +58,7 @@ @@ -85,7 +88,7 @@ @@ -122,7 +125,7 @@
Event Name - {$regEvent.fieldData.event_name} + {$terms.reg_term_event_cap} Name: + + {if $regEvent.fieldFail.event_name}

{$regEvent.fieldFail.event_name}

{/if}
+ This name will only be used by the {$terms.reg_term_registrations_name} add-on (only for {$terms.reg_term_registration_plur}). This will not change the name of an {$terms.reg_term_event} + in the Events Calendar add-on.
Event {$terms.reg_term_registration_cap} Code:{$terms.reg_term_event_cap} {$terms.reg_term_registration_cap} Code: {if $regEvent.fieldFail.event_code}

{$regEvent.fieldFail.event_code}

{/if}
@@ -40,14 +43,14 @@
{$terms.reg_term_registration_plur_cap} Active: - Permits users to {$terms.reg_term_register} for events on the front-end + Permits users to {$terms.reg_term_register} for {$terms.reg_term_event_plur} on the front-end {if $regEvent.fieldFail.active}

{$regEvent.fieldFail.active}

{/if}
Admin Active: - Permits admin to enter registrations for this event event when "{$terms.reg_term_registration_plur_cap} Active" is not set + Permits admin to enter registrations for this {$terms.reg_term_event} when "{$terms.reg_term_registration_plur_cap} Active" is not set {if $regEvent.fieldFail.admin_active}

{$regEvent.fieldFail.admin_active}

{/if}
Date/Time Specific {$terms.reg_term_registration_plur_cap}: - Check this box for events where {$terms.reg_term_registration_plur} are for specific dates and times. + Check this box for {$terms.reg_term_event_plur} where {$terms.reg_term_registration_plur} are for specific dates and times. {if $regEvent.fieldFail.time_specific}

{$regEvent.fieldFail.time_specific}

{/if}
End of {$terms.reg_term_registration_cap}: - This is the number of hours before an event starts after which no more {$terms.reg_term_registration_plur} are permitted.
+ This is the number of hours before an {$terms.reg_term_event} starts after which no more {$terms.reg_term_registration_plur} are permitted.
Hours {if $regEvent.fieldFail.reg_hours_before}

{$regEvent.fieldFail.reg_hours_before}

{/if}
{$terms.reg_term_registration_cap} Description: - This will be displayed in addition to any description text from the event + This will be displayed in addition to any description text from the {$terms.reg_term_event} {php} wp_editor('{$regEvent.fieldData.descr|escape:quotes}', 'glm_descr', array( 'media_buttons' => false, @@ -184,7 +187,7 @@
-

+

diff --git a/views/admin/registrations/eventEditCustomFields.html b/views/admin/registrations/eventEditCustomFields.html index abd2b80..3f97f59 100644 --- a/views/admin/registrations/eventEditCustomFields.html +++ b/views/admin/registrations/eventEditCustomFields.html @@ -4,17 +4,17 @@

Additional (custom) Fields

- {if $regEventUpdated}{$terms.reg_term_registration_cap} Event Updated{/if} - {if $regEventUpdateError}{$terms.reg_term_registration_cap} Event Update Error{/if} - {if $regEventAdded}{$terms.reg_term_registration_cap} Event Added{/if} + {if $regEventUpdated}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Updated{/if} + {if $regEventUpdateError}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Update Error{/if} + {if $regEventAdded}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Added{/if}

{if apply_filters('glm-members-customfields-plugin-active', false)}

{* Per Event Form for this event *} -

Requested once when {$terms.reg_term_registering} for this event

-

These are additional fields of information that will be requested for this event in each submission.

+

Requested once when {$terms.reg_term_registering} for this {$terms.reg_term_event}

+

These are additional fields of information that will be requested for this {$terms.reg_term_event} in each submission.

{assign var="eventFid" value="glm_reg_customfields_reg_event_`$regEventID`"} {apply_filters('glm-members-customfields-form-edit', '', $eventFid)} @@ -22,8 +22,8 @@ {* Per Attendee Form for this event *}

-

Requested for each {$terms.reg_term_attendee} for this event

-

These are additional fields of information that will be requested for each registrant for this event.

+

Requested for each {$terms.reg_term_attendee} for this {$terms.reg_term_event}

+

These are additional fields of information that will be requested for each registrant for this {$terms.reg_term_event}.

{assign var="attendeeFid" value="glm_reg_customfields_reg_event_attendee_`$regEventID`"} {apply_filters('glm-members-customfields-form-edit', '', $attendeeFid)} @@ -33,7 +33,7 @@

{foreach $classes as $class}

Requested for each {$terms.reg_term_attendee} for level: {$class.name}

-

These are additional fields of information that will be requested for each registrant for this event.

+

These are additional fields of information that will be requested for each registrant for this {$terms.reg_term_event}.

{assign var="levelFid" value="glm_reg_customfields_reg_event_`$regEventID`_level_`$class.id`"} {apply_filters('glm-members-customfields-form-edit', '', $levelFid)} diff --git a/views/admin/registrations/eventEditLevels.html b/views/admin/registrations/eventEditLevels.html index bc682e7..40f993d 100644 --- a/views/admin/registrations/eventEditLevels.html +++ b/views/admin/registrations/eventEditLevels.html @@ -2,9 +2,9 @@ {include file='admin/registrations/eventSubTabs.html'}

- {if $regEventUpdated}{$terms.reg_term_registration_cap} Event Updated{/if} - {if $regEventUpdateError}{$terms.reg_term_registration_cap} Event Update Error{/if} - {if $regEventAdded}{$terms.reg_term_registration_cap} Event Added{/if} + {if $regEventUpdated}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Updated{/if} + {if $regEventUpdateError}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Update Error{/if} + {if $regEventAdded}{$terms.reg_term_registration_cap} {$terms.reg_term_event_cap} Added{/if}

{* Event Registration App - Backbone.js *} @@ -13,8 +13,8 @@ {literal} diff --git a/views/admin/registrations/eventSubTabs.html b/views/admin/registrations/eventSubTabs.html index c5b0135..326f699 100644 --- a/views/admin/registrations/eventSubTabs.html +++ b/views/admin/registrations/eventSubTabs.html @@ -7,7 +7,7 @@

- Event Dashboard + {$terms.reg_term_event_cap} Dashboard Edit {$terms.reg_term_registration_cap} Settings {$terms.reg_term_registration_cap} Levels & Charges {if apply_filters('glm-members-customfields-plugin-active', false)} diff --git a/views/admin/registrations/eventsDashboard.html b/views/admin/registrations/eventsDashboard.html index 3ba765e..ef7e7ee 100644 --- a/views/admin/registrations/eventsDashboard.html +++ b/views/admin/registrations/eventsDashboard.html @@ -9,7 +9,7 @@ -

List of {$terms.reg_term_registration_cap} Events

+

List of {$terms.reg_term_registration_cap} {$terms.reg_term_event_plur_cap}

Text Search: @@ -25,8 +25,8 @@ {if $paging} - - + + {/if}
@@ -40,7 +40,7 @@ ID - Event Name + {$terms.reg_term_event_cap} Name Maximum
{$terms.reg_term_attendee_plur_cap} {$terms.reg_term_registered_cap} Cart
Hold @@ -82,14 +82,14 @@ {/foreach} {else} - (no {$terms.reg_term_registration} events listed) + (no {$terms.reg_term_registration} {$terms.reg_term_event} listed) {/if} {if $paging} - - + + {/if}
diff --git a/views/admin/registrations/registrationEventDeleted.html b/views/admin/registrations/registrationEventDeleted.html index 5e6247a..d969573 100644 --- a/views/admin/registrations/registrationEventDeleted.html +++ b/views/admin/registrations/registrationEventDeleted.html @@ -1,6 +1,6 @@ {include file='admin/registrations/eventHeader.html'} -

Event removed from {$terms.reg_term_registration_plur}.

+

{$terms.reg_term_event_cap} removed from {$terms.reg_term_registration_plur}.

{include file='admin/footer.html'} diff --git a/views/admin/registrations/requestEdit.html b/views/admin/registrations/requestEdit.html index 8086f6e..b23d1ce 100644 --- a/views/admin/registrations/requestEdit.html +++ b/views/admin/registrations/requestEdit.html @@ -84,7 +84,7 @@ - + {foreach $cart.events as $event} diff --git a/views/admin/registrations/requestHeader.html b/views/admin/registrations/requestHeader.html index 271097a..3ea1a0c 100644 --- a/views/admin/registrations/requestHeader.html +++ b/views/admin/registrations/requestHeader.html @@ -1,5 +1,5 @@
-

Event Registrations

+

{$terms.reg_term_event_cap} Registrations

Requests Dashboard Last Selected Request diff --git a/views/admin/settings/registrationsMisc.html b/views/admin/settings/registrationsMisc.html index 882ddf2..e6b1424 100644 --- a/views/admin/settings/registrationsMisc.html +++ b/views/admin/settings/registrationsMisc.html @@ -129,7 +129,7 @@ {if $regMisc.fieldFail.notify_text}

{$regMisc.fieldFail.notify_text}

{/if}

- +
EventStart Date/TimeClassRateCreditsRegistrantsCharge
{$terms.reg_term_event_cap}Start Date/TimeClassRateCreditsRegistrantsCharge
{$event.event_name}{$event.event_datetime.datetime}
 

Notification to Event Contacts

 

Notification to {$terms.reg_term_event_cap} Contacts

Subject: diff --git a/views/front/registrations/accountHeader.html b/views/front/registrations/accountHeader.html index 51afb8b..4de6e05 100644 --- a/views/front/registrations/accountHeader.html +++ b/views/front/registrations/accountHeader.html @@ -2,7 +2,7 @@ @@ -35,7 +35,7 @@
- + {foreach $regRequests as $rr} diff --git a/views/front/registrations/cartLinkWidget.html b/views/front/registrations/cartLinkWidget.html index afdfe94..b4295e7 100644 --- a/views/front/registrations/cartLinkWidget.html +++ b/views/front/registrations/cartLinkWidget.html @@ -31,7 +31,7 @@
IDDate createdDate last updatedEventsRegistrantsSelected
IDDate createdDate last updated{$terms.reg_term_event_plur_cap}RegistrantsSelected
- + {foreach $regRequests as $rr} diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html index 38a46ee..7d9f2cd 100644 --- a/views/front/registrations/checkout.html +++ b/views/front/registrations/checkout.html @@ -214,7 +214,7 @@

Additional information requested:

- For Event: {$event.event_name} + For {$terms.reg_term_event_cap}: {$event.event_name} {apply_filters('glm-members-customfields-form-display', '', $fid, $cartId, 'checkoutForm', false)} @@ -230,7 +230,7 @@

Terms and Conditions

- You must check the boxes below to confirm that you agree to the Terms and Conditions for each event. + You must check the boxes below to confirm that you agree to the Terms and Conditions for each {$terms.reg_term_event}.
 
diff --git a/views/front/registrations/header.html b/views/front/registrations/header.html index 4d70a1e..a4e05e7 100644 --- a/views/front/registrations/header.html +++ b/views/front/registrations/header.html @@ -9,7 +9,7 @@ {/if}
{if $page != 'register'} - {$terms.reg_term_register_cap} for Another Event + {$terms.reg_term_register_cap} for Another {$terms.reg_term_event_cap} {/if} {if $page != 'cart'} ↵ Return to Cart diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index 440e6db..babe832 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -145,7 +145,7 @@ {/foreach} {else} -

Sorry, no events are available for {$terms.reg_term_registration} at this time.

+

Sorry, no {$terms.reg_term_event_plur} are available for {$terms.reg_term_registration} at this time.

{/if}
-- 2.17.1
IDDate createdDate last updatedEventsRegistrantsSelected
IDDate createdDate last updated{$terms.reg_term_event_plur_cap}RegistrantsSelected