From: Chuck Scott Date: Tue, 23 Jan 2018 19:21:37 +0000 (-0500) Subject: Added new "terms" to management, fixed errors & warnings, updated UI. X-Git-Tag: v1.0.0^2~47 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=c9b7ae18d83df29f5c44725c6b967a469ff00a65;p=WP-Plugins%2Fglm-member-db-registrations.git 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. --- 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.23.sql deleted file mode 100644 index e396ee8..0000000 --- a/setup/databaseScripts/create_database_V0.0.23.sql +++ /dev/null @@ -1,769 +0,0 @@ --- Gaslight Media Registration Database --- File Created: 01/18/2017 14:40:00 --- Database Version: 0.0.19 --- Database Creation Script --- --- To permit each query below to be executed separately, --- all queries must be separated by a line with four dashes --- -/* - * General Database Organization - * ----------------------------- - * - * management - General options and configuration - Site manager access only - * - * misc - Misc settings and text - Site owner may update - * - * payment codes - Promotional payment codes - Used with various things - * --> Event, Submission, Event Registration, Event Registrant, Account or global - * - * reg_event - Describes registration for that event - * reg_time - One record for each date/time this event has people registered - Primarily tracks attendee counts and charge totals - * reg_class - Type of registration for this event (one or more) - * reg_rates - Date range / rate for a reg class (one or more) - * - * reg_account - Describes someone who submits / pays for a registration - * Make these two things the same table.... - * registrant - A person who is registered for an event - * - * reg_request - Information on a specific request for registrations - * reg_request_event - Event selected (one or more) - * reg_request_class - Class of registration (one or more) - * reg_request_rate - Specific registration date/rate (one or more) - * reg_request_registrant - Registrant (one or more) - * - * NOTE: additional fields and added fields data will be coming from the Custom Fields add-on - * - * Overall Flow - * ------------ - * - * User selects an event - * If the event has available registrations - * User selects a date for the registration (or if only one that's selected automatically) - * User can log back into registrations at this point if they've been there before and have a password, create an ccount, or continue as guest ??? - * User selects an available rate type and adds one or more registrants for that rate type - * User may loop back to select additional rate type(s) and registrants - * User may go back to date selection and request additional rate types and registrants for the addional dates - * User may go back to select additional dates and do registrations for those dates as above - * User may go back to select other events and do registrations for them as above - * User may select the "Cart" and deselect something added to it - * User may checkout - * - */ - -/* - * NOTE: Anything below here may not be completed or accurate yet. I'm still working though this - * Lines commented out are selected for possible deletion. - * The INSERT statements are not up-to-date with the tables. - * The "config/plugin.ini" file in this plugin is also a work in progress. - */ - --- Management Options --- General configurationm parameters for the Registrations application --- Only one entry in this table! -CREATE TABLE {prefix}management ( - id INT NOT NULL AUTO_INCREMENT, - canonical_reg_page TINYTEXT NULL, -- Canonical page slug for registrations - -- System Owner Information - reg_org_name TINYTEXT NULL, -- Customer Information - Name of Organization - reg_org_short TINYTEXT NULL, - reg_org_address TINYTEXT NULL, - reg_org_city TINYTEXT NULL, - reg_org_state TINYTEXT NULL, - reg_org_zip TINYTEXT NULL, - reg_org_phone TINYTEXT NULL, - reg_org_toll_free TINYTEXT NULL, - reg_org_internal_email TINYTEXT NULL, - reg_org_from_email TINYTEXT NULL, - reg_payment_methods SMALLINT NULL, -- Payment methods available for all registrations - Bitmap - see payment_method in plugin.ini - reg_proc_methods SMALLINT NULL, -- Credit Cart payment processing methods available - Bitmap - see proc_method in plugin.ini - reg_cc_accepts SMALLINT NULL, -- Credit Cards Accepted - Bitmap - See credit_card in plugin.ini - -- Authorize.net Credentials - reg_authorize_net_login TINYTEXT NULL, - reg_authorize_net_key TINYTEXT NULL, - reg_authorize_net_test TINYINT NULL, -- Authorize.net test mode - List - see proc_test_mode in plugin.ini - reg_authorize_net_conf BOOLEAN NULL, -- Flag to send payment confirmation Email from Authorize.net - reg_authorize_net_merchant_email TINYTEXT NULL, -- E-Mail Authorize.net will send copy of confirmation E-Mail - -- Merchant Solutions Credentials - reg_merchant_solutions_acctid TINYTEXT NULL, -- Merchant Solutions credentials - reg_merchant_solutions_merchantpin TINYTEXT NULL, - reg_merchant_solutions_test TINYINT NULL, -- Merchant Solutions test mode - List - see proc_test_mode in plugin.ini - reg_merchant_solutions_conf BOOLEAN NULL, -- Flag to send payment confirmation Email - reg_merchant_solutions_merchant_email TINYTEXT NULL, -- Merchant Solutions will send copy of confirmation E-Mail - -- Billing settings - reg_full_billing_info BOOLEAN NULL, -- Always request full billing information in checkout page regardless of the following settings - reg_bill_info_req_no_charge SMALLINT NULL, -- Bitmap of fields to use in checkout for these types of payments - See billing_field in plugin.conf - reg_bill_info_req_comp_code SMALLINT NULL, - reg_bill_info_req_cash SMALLINT NULL, - reg_bill_info_req_check SMALLINT NULL, - reg_bill_info_req_credit_card SMALLINT NULL, - reg_bill_info_req_merchant_call SMALLINT NULL, - -- Misc Options - reg_medical_info BOOLEAN NULL, -- This site can ask for "Medical Info" - set in main category of an event - PRIMARY KEY (id) -); - ----- - --- Terms used in site modifiable on Management page in admin - Only 1 entry in this table --- Terms in this table should be all self-explanatory -CREATE TABLE {prefix}settings_terms ( - id INT NOT NULL AUTO_INCREMENT, - reg_term_registrations_name TINYTEXT NULL, -- Term "Event Registration" - reg_term_registration TINYTEXT NULL, - reg_term_registration_cap TINYTEXT NULL, - reg_term_registration_plur TINYTEXT NULL, - reg_term_registration_plur_cap TINYTEXT NULL, - reg_term_register TINYTEXT NULL, - reg_term_register_cap TINYTEXT NULL, - reg_term_registers TINYTEXT NULL, -- Intransitive verb of register - reg_term_registering TINYTEXT NULL, - reg_term_registering_cap TINYTEXT NULL, - reg_term_registered TINYTEXT NULL, - reg_term_registered_cap TINYTEXT NULL, - reg_term_attendee TINYTEXT NULL, - reg_term_attendee_cap TINYTEXT NULL, - reg_term_attendee_plur TINYTEXT NULL, - reg_term_attendee_plur_cap TINYTEXT NULL, - reg_term_attending TINYTEXT NULL, - reg_term_attended TINYTEXT NULL, - reg_term_registered_user TINYTEXT NULL, - reg_term_registered_user_cap TINYTEXT NULL, - reg_term_registered_user_plur TINYTEXT NULL, - reg_term_registered_user_plur_cap TINYTEXT NULL, - reg_term_id TINYTEXT NULL, - reg_term_id_cap TINYTEXT NULL, - reg_term_id_plur TINYTEXT NULL, - reg_term_id_plur_cap TINYTEXT NULL, - reg_term_password TINYTEXT NULL, - reg_term_password_cap TINYTEXT NULL, - reg_term_password_plur TINYTEXT NULL, - reg_term_password_plur_cap TINYTEXT NULL, - reg_term_instructor TINYTEXT NULL, - reg_term_instructor_cap TINYTEXT NULL, - reg_term_instructor_plur TINYTEXT NULL, - reg_term_instructor_plur_cap TINYTEXT NULL, - reg_term_payment_code TINYTEXT NULL, - reg_term_payment_code_cap TINYTEXT NULL, - reg_term_payment_code_plur TINYTEXT NULL, - reg_term_payment_code_plur_cap TINYTEXT NULL, - reg_term_registration_button TINYTEXT NULL, - reg_term_contact_information TINYTEXT NULL, - PRIMARY KEY (id) -); - ----- - --- Misc system-wide customer configurable configuration --- Various text and flags to be configured by customer --- Only one entry in this table! -CREATE TABLE {prefix}misc ( - id INT NOT NULL AUTO_INCREMENT, - reg_bulletin TEXT NULL, -- Text to display at top of first registration page - cart_page_text TEXT NULL, -- Text to display at top of cart page - checkout_page_text TEXT NULL, -- Text to display at top of checkout page - summary_page_text TEXT NULL, -- Text to display at top of summary page (after checkout) - reg_terms TEXT NULL, -- Registration terms and conditions - notify_subject TEXT NULL, -- Subject of notification E-Mail to site owner - notify_text TEXT NULL, -- Notification E-Mail text for site owner - instr_notify_subject TEXT NULL, -- Subject of notification E-Mail to instructor - instr_notify_text TEXT NULL, -- Notification E-Mail text for instructor - submission_notify_subject TEXT NULL, -- Subject of notification E-Mail to person submitting the registrations - submission_notify_text TEXT NULL, -- Notification E-Mail text to person submitting the registrations - registrant_notify_subject TEXT NULL, -- Subject of notification E-Mail to registrant - registrant_notify_text TEXT NULL, -- Text of notification E-Mail to registrant - submission_ack_subject TEXT NULL, -- Subject of acknowledgement E-Mail to person submitting the registrations - submission_ack_text TEXT NULL, -- Text of acknowledgement E-Mail text to person submitting the registrations - registrant_ack_subject TEXT NULL, -- Subject of acknowledgement E-Mail to registrant - registrant_ack_text TEXT NULL, -- Text of acknowledgement E-Mail to registrant - PRIMARY KEY (id) -); - ----- - --- Payment Codes --- Promotional payment codes for free/discounted payment -CREATE TABLE {prefix}payment_code ( - id INT NOT NULL AUTO_INCREMENT, - code_type TINYINT NULL, -- Type of adjustment - Free only to start with - See pay_code_type in plugin.ini - ref_type TINYINT NULL, -- See payment_ref_type in plugin.ini - ref_dest INT NULL, -- Pointer to the specific entity of ref_type - code TINYTEXT NULL, -- Text code user must enter to use - amount FLOAT, -- Amount of discount if not type "Free" - Either $ amount or percent - expire_date DATE NULL, -- Expiration Date - descr TEXT NULL, - PRIMARY KEY (id), - INDEX (ref_dest), - INDEX (code(10)) -); - ----- - --- Registration event specific information --- One record for each event in Events add-on --- Only created when an event is selected to offer registrations -CREATE TABLE {prefix}reg_event ( - id INT NOT NULL AUTO_INCREMENT, - event INT NULL, -- Pointer to event in Events add-on - False if event record in Events add-on no longer exists - event_name TINYTEXT NULL, -- Name of Event so it will always be in the cart data - event_code TINYTEXT NULL, -- A short code used to reference this event - can be used to directly select an event to register for - notify_email TINYTEXT NULL, -- E-Mail addresses to receive notification of a registration other than org_internal_email in management, comma separated - admin_active BOOLEAN NULL, -- Active flag for admin from Events - If logged in Admin user for this event and this is true then admin user may enter registrations even if active is off. - active BOOLEAN NULL, -- Active flag to indicate that this event is available for registrations - time_specific BOOLEAN NULL, -- Registration for this event is not date/time specific. Can attend any date/time of event. - attendees BOOLEAN NULL, -- Registration requires attendees - Otherwise the person submitting the registration is the registrant - attendee_max MEDIUMINT NULL, -- Attendee limit - 0 = unlimited - attendee_max_per_reg TINYINT NULL, -- Maximum attendees per registration submission - 0 = unlimited - reg_hold_minutes MEDIUMINT NULL, -- Number of minutes hold time for an inactive cart before registrant count hold expires (after which cart attempts to hold again on next access) - cart_hold_days MEDIUMINT NULL, -- Number of days hold time for inactive cart before cart is purged - reg_hours_before MEDIUMINT NULL, -- Number of hours before an event that is the latest a registration may be submitted. - registration_account_options SMALLINT NULL, -- Bitmap of how user accounts may be used for this event - See registration_account_option in plugin.ini - payment_methods SMALLINT NULL, -- Bitmap of payment methods available to users for this event - See payment_method in plugin.ini - restricted_payment_methods SMALLINT NULL, -- Bitmap of restricted (admin use only) payment methods for this event - see payment_method - descr TEXT NULL, -- Registrations specific description field for this event - terms TEXT NULL, -- Terms and Conditions for registration - first_datetime DATETIME NULL, -- Start of first listed date/time for this event - last_datetime DATETIME NULL, -- Start of last listed date/time for this event - reg_file TINYTEXT NULL, -- Name of a downloadable file - reg_file_title TINYTEXT NULL, -- Title for downloadable file - form_revision SMALLINT NULL, -- Current MagicForm form revision - notes TEXT NULL, -- System operator's notes for this event - Not visible to users - PRIMARY KEY (id), - INDEX (event), - INDEX (event_code(10)) -); - ----- - --- Registration Event Time - Information and summary data for a specific event instance (relates to a particular time record in events) --- A pseudo entry is created if registration is not date/time sensitive for this event. The pseudo entry does not point to an event time. --- These are created the first time a person tries to register for an event instance (time) --- One or more for each event -CREATE TABLE {prefix}reg_time ( - id INT NOT NULL AUTO_INCREMENT, - active BOOLEAN NULL, -- Flag. True if registrations is available for this time - non_time_specific BOOLEAN NULL, -- Flag. True if this is a pseudo time for non-time-specific events - Other informational times for the event will have this flag off - reg_event INT NULL, -- Pointer to reg_event table - event_time INT NULL, -- ID of events times table entry in Events add-on - If false (0), then this is a pseudo entry to use for all registrations (non-date/time specific) - start_datetime DATETIME NULL, -- Date and time when event instance starts - end_datetime DATETIME NULL, -- Date and time when event instance ends - all_day BOOLEAN NULL, -- All Day flag - Informational - attendees BOOLEAN NULL, -- Flag if tracking attendees or if only one per registration submission (registers account submitting) - get from reg_event - attendee_max MEDIUMINT NULL, -- Attendee count limit - 0 = unlimited - get from reg_event record - attendee_count MEDIUMINT NULL, -- Current attendee count - calculated on the fly and stored here for reference - attendees_pending MEDIUMINT NULL, -- Current number of attendees for this time in active pending carts (Not checked out and attendees slots held) - attendees_available MEDIUMINT NULL, -- Currently available attendee count (limit - current - pending) - total_base_charge DOUBLE NULL, -- Total base charges - total_per_attendee DOUBLE NULL, -- Total per-attendee charges - total_other DOUBLE NULL, -- Total other charges (meals, extras, fees, ...) - total_taxes DOUBLE NULL, -- Total taxes charged - total_charges DOUBLE NULL, -- Total charges (sum of all above) - total_discounts DOUBLE NULL, -- Total discounts of all types (applied payment codes, etc...) - total_payments DOUBLE NULL, -- Total net payments (total charges - total discounts) - descr TEXT NULL, -- Optional description field for this time entry - PRIMARY KEY (id), - INDEX (reg_event), - INDEX (event_time), - INDEX (start_datetime) -); - ----- - --- Pending Attendees - In carts but not checked out --- Attendee counts may be held for a particular reg_time entry for carts that have not been checked out --- These are held for reg_event reg_hold_minutes, afterwhich they are timed out and removed from this table --- Cart entries are given the ID's for these entries when a hold is requested, if the entry is gone, the hold has expired -CREATE TABLE {prefix}reg_time_pending ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event table - reg_time INT NULL, -- ID of time record - registrant INT NULL, -- ID of reg_request_registrant record -- - expire_time DATETIME NULL, -- Time at which this hold expires - PRIMARY KEY (id), - INDEX (reg_event), - INDEX (reg_time) -); - ----- - --- Registration Class - Type of registration for a specific event - Equates to "Rate Options" in the old system --- One or more for each event -CREATE TABLE {prefix}reg_class ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event table - name TINYTEXT NULL, -- Name of this registration type - descr TEXT NULL, -- Description - PRIMARY KEY (id), - INDEX (reg_event) -); - ----- - --- Rates and dates for a particular reg_class --- One or more per reg_class - **** Days should not overlap for a particular reg_class -CREATE TABLE {prefix}reg_rate ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event table - reg_class INT NULL, -- Pointer to reg_class table - name TINYTEXT NULL, -- Name of this rate - start_days INT NULL, -- # of days before event time rate becomes available - may be selected as a date then converted for storage - end_days INT NULL, -- # of days before event time rate becomes unavailable - base_rate FLOAT, -- Base rate to register - per_registrant FLOAT, -- Rate per registrant - registrant_credits TINYINT NULL, -- Number of registrants included in base rate - PRIMARY KEY (id), - INDEX (reg_event), - INDEX (reg_class) -); - ----- - --- Notifications --- None or more for each reg event -CREATE TABLE {prefix}reg_notification ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event table - name TINYTEXT NULL, -- Name of this notification - notification_days INT NULL, -- # of days before or after event that notification takes place (- before, + after) - message TEXT NULL, -- Content of message (uses template parameters to merge event/attendee data) - PRIMARY KEY (id), - INDEX (reg_event) -); - ----- - --- Notification Queue -CREATE TABLE {prefix}notification_queue ( - id INT NOT NULL AUTO_INCREMENT, - reg_notification INT NOT NULL, -- Pointer to the reg_notification table - account INT NOT NULL, -- Pointer to the account table - queued_time DATETIME NOT NULL, -- Creation time - processed_time DATETIME NULL, -- The time this queue was processed. (sent out) - to_email TINYTEXT NOT NULL, -- The To email address - from_email TINYTEXT NOT NULL, -- The From email address - subject TINYTEXT NOT NULL, -- The subject - html_message TEXT NOT NULL, -- The complete html message - PRIMARY KEY (id) -); - ----- - --- An account for a person submitting a registration or a registrant for an event --- Depending on the use of these entries may not have all data included --- A single account may be referenced as a person submitting registrations and/or a person registered for an event -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 - lname TINYTEXT NULL, - org TINYTEXT NULL, - title TINYTEXT NULL, - addr1 TINYTEXT NULL, - addr2 TINYTEXT NULL, - city TINYTEXT NULL, - state TINYTEXT NULL, - zip TINYTEXT NULL, - country TINYTEXT NULL, - phone TINYTEXT NULL, - fax TINYTEXT NULL, - bill_fname TINYTEXT NULL, -- Last used billing information - Also stored in each registration request - bill_lname TINYTEXT NULL, - bill_org TINYTEXT NULL, - bill_title TINYTEXT NULL, - bill_addr1 TINYTEXT NULL, - bill_addr2 TINYTEXT NULL, - bill_city TINYTEXT NULL, - bill_state TINYTEXT NULL, - bill_zip TINYTEXT NULL, - bill_country TINYTEXT NULL, - bill_phone TINYTEXT NULL, - bill_fax TINYTEXT NULL, - email TINYTEXT NULL, - password TINYTEXT NULL, -- Crypted password for login back into this account - email_ok BOOLEAN NULL, - is_member BOOLEAN NULL, -- Is a member of the entity that owns the site - contact_id INT NULL, -- Pointer to GLM Associate member contact record if account is for a member contact - contact_fname TINYTEXT NULL, - contact_lname TINYTEXT NULL, - contact_org TINYTEXT NULL, - contact_title TINYTEXT NULL, - contact_addr1 TINYTEXT NULL, - contact_addr2 TINYTEXT NULL, - contact_city TINYTEXT NULL, - contact_state TINYTEXT NULL, - contact_zip TINYTEXT NULL, - contact_country TINYTEXT NULL, - contact_phone TINYTEXT NULL, - contact_fax TINYTEXT NULL, - contact_email TINYTEXT NULL, - contact_email_ok BOOLEAN NULL, - guardian TINYTEXT NULL, - emer_contact TINYTEXT NULL, - emer_phone TINYTEXT NULL, - med_history TINYTEXT NULL, - allergy_med TINYTEXT NULL, - date_created DATE NULL, - notes TEXT NULL, -- System operator's notes for this account - not visible to account owner - user_trace_info TINYTEXT NULL, -- IP Address of user computer and timestamp of last update - PRIMARY KEY (id), - INDEX (registered_by), - INDEX (member_id(10)), - INDEX (fname(10)), - INDEX (lname(10)), - INDEX (org(10)), - INDEX (city(10)), - INDEX (state(5)), - INDEX (zip(5)), - INDEX (email(10)), - INDEX (contact_id) -); - ----- - --- A request for registration --- Has one or more reg_detail records associated with it -CREATE TABLE {prefix}reg_request ( - id INT NOT NULL AUTO_INCREMENT, - account INT NULL, -- Pointer to user account (reg_account) who submitted the registrations. If 0 then guest request (prior to checkout) - validated BOOLEAN NULL, -- Flag that indicates if request passed last validation with checkRegistrationRequest() - validation_message TEXT NULL, -- Reasons that request did not pass validation with checkRegistrationRequest() - Serialized array - bill_fname TINYTEXT NULL, -- Billing information used for this registration submission - Updates account billing address - Kept here for each request - bill_lname TINYTEXT NULL, - bill_org TINYTEXT NULL, - bill_title TINYTEXT NULL, - bill_addr1 TINYTEXT NULL, - bill_addr2 TINYTEXT NULL, - bill_city TINYTEXT NULL, - bill_state TINYTEXT NULL, - bill_zip TINYTEXT NULL, - bill_country TINYTEXT NULL, - bill_phone TINYTEXT NULL, - bill_email TINYTEXT NULL, - date_submitted DATE NULL, -- Date of final submission (checkout complete) - pay_method INT NULL, -- See payment_method in plugin.ini - payment_code TINYTEXT NULL, -- Payment_code text (comp code) - if submitted and validated - status SMALLINT NULL, -- See submission_status in plugin.ini - total DOUBLE PRECISION NULL, -- Total charge including all fees and taxes - total_discounts DOUBLE PRECISION NULL, -- Total of all comps and discounts - registrants SMALLINT NULL, -- Total number of registrants in this cart - cc_type TINYINT NULL, -- Credit Card type (if used) - See credit_card in plugin.ini - cc_name TINYTEXT NULL, - cc_numb TINYTEXT NULL, - cc_exp TINYTEXT NULL, - cc_cvv TINYTEXT NULL, - cc_conf TINYTEXT NULL, -- Confirmation code back from card processor - cc_proc_mesg TINYTEXT NULL, -- Message received from payment processor - summary TEXT NULL, -- HTML summary of cart contents, costs and payment - Use same HTML displayed to user - mf_data TEXT NULL, -- Any MagicForm data associated with registrant - notes TEXT NULL, -- System operator's notes for this registration request - user_trace_info TEXT NULL, -- IP Address of user computer and timestamp - date_created DATETIME NULL, -- Date request was first created - last_update DATETIME NULL, -- Last update date/time - Used for timing out pending carts and attendee counts - PRIMARY KEY (id), - INDEX (account), - INDEX (date_submitted) -); - ----- - --- Registration for a specific event --- Has one or more reg_selected_rate records associated with it -CREATE TABLE {prefix}reg_request_event ( - id INT NOT NULL AUTO_INCREMENT, - reg_request INT NULL, -- Pointer to reg_request table - reg_event INT NULL, -- Pointer to reg_event - event_name TINYTEXT NULL, -- Name of Event so it will always be in the cart data - notes TEXT NULL, -- System operator's notes for this registration request - PRIMARY KEY (id), - INDEX (reg_request), - INDEX (reg_event) -); - ----- - --- A particular reg_class selected --- Has one or more reg_request_rate records associated with it -CREATE TABLE {prefix}reg_request_class ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event entry - reg_request INT NULL, -- Pointer to the registration request record - reg_request_event INT NULL, -- Pointer to reg_request_event table entry - class INT NULL, -- Pointer to event reg_class table - False (0) if registration class no longer exits - class_name TINYTEXT NULL, -- Name of event class at the time selected - notes TEXT NULL, -- System operator's notes for this registration request - PRIMARY KEY (id), - INDEX (reg_event), - INDEX (reg_request_event) -); - ----- - --- A particular reg_rate selected --- Has one or more reg_request_registrant records associated with it -CREATE TABLE {prefix}reg_request_rate ( - id INT NOT NULL AUTO_INCREMENT, - reg_event INT NULL, -- Pointer to reg_event entry - reg_request INT NULL, -- Pointer to the registration request record - reg_request_event INT NULL, -- Pointer to reg_request_event table entry - reg_request_class INT NULL, -- Pointer to reg_request_class table entry - rate INT NULL, -- Pointer to event reg_rate table - False (0) if registration rate no longer exists - rate_name TINYTEXT NULL, -- Name of event class rate at the time selected - base_rate FLOAT, -- Base rate at time of registration - per_registrant FLOAT, -- Per Registrant Rate at time of registration - registrant_credits TINYINT NULL, -- Number of registrants included in base rate at time of registration - notes TEXT NULL, -- System operator's notes for this registration request - PRIMARY KEY (id), - INDEX (reg_event), - INDEX (reg_request_event), - INDEX (reg_request_class) -); - ----- - --- A specific registrant for a selected registration rate -CREATE TABLE {prefix}reg_request_registrant ( - id INT NOT NULL AUTO_INCREMENT, - account INT NULL, -- Pointer to the account entry for the person being registered - False (0) if account no longer exists or registrant account not needed - reg_event INT NULL, -- Pointer to reg_event entry - reg_time INT NULL, -- Pointer reg_time entry - event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart - reg_request INT NULL, -- Pointer to the registration request record - reg_request_event INT NULL, -- Pointer to reg_request_event table entry - reg_request_class INT NULL, -- Pointer to reg_request_class table entry - reg_request_rate INT NULL, -- Pointer to reg_request_rate table entry - not_attending BOOLEAN DEFAULT false, -- Flag to say if registrant is not attending - set to true when not attending - fname TINYTEXT NULL, -- First name of registrant at the time of selection - lname TINYTEXT NULL, -- Last name of registrant at the time of selection - notes TEXT NULL, -- System operator's notes for this registration request - PRIMARY KEY (id), - INDEX (account), - INDEX (reg_event), - INDEX (reg_time), - INDEX (reg_request), - INDEX (reg_request_event), - INDEX (reg_request_class), - INDEX (reg_request_rate) -); - ----- - --- A specific use of a payment code in this request -CREATE TABLE {prefix}reg_request_pay_code ( - id INT NOT NULL AUTO_INCREMENT, - payment_code INT NULL, -- Pointer to payment code - code TINYTEXT NULL, -- Copy of Payment Code text in case payment code is deleted or changed - reg_request INT NULL, -- Pointer to the registration request record - credit DOUBLE PRECISION NULL, -- Total credit for this payment code - expire_date DATE NULL, -- Expiration Date - NOT USING NOW - Getting from payment_code table always - PRIMARY KEY (id), - INDEX (payment_code), - INDEX (reg_request) -); - ----- - --- Insert into management table -INSERT INTO {prefix}management - ( - canonical_reg_page, - reg_org_name, - reg_org_short, - reg_org_address, - reg_org_city, - reg_org_state, - reg_org_zip, - reg_org_phone, - reg_org_toll_free, - reg_org_internal_email, - reg_org_from_email, - reg_payment_methods, - reg_proc_methods, - reg_cc_accepts, - reg_authorize_net_login, - reg_authorize_net_key, - reg_authorize_net_test, - reg_authorize_net_conf, - reg_authorize_net_merchant_email, - reg_merchant_solutions_acctid, - reg_merchant_solutions_merchantpin, - reg_merchant_solutions_test, - reg_full_billing_info, - reg_bill_info_req_no_charge, - reg_bill_info_req_comp_code, - reg_bill_info_req_cash, - reg_bill_info_req_check, - reg_bill_info_req_credit_card, - reg_bill_info_req_merchant_call, - reg_medical_info - ) - VALUES - ( - 'registrations', -- reg_canonical_reg_page, - 'Gaslight Media', -- reg_org_name, - 'GLM', -- reg_org_short, - '120 E. Lake St.', -- reg_org_address, - 'Petoskey', -- reg_org_city, - 'MI', -- reg_org_state, - '49770', -- reg_org_zip, - '231-487-0692', -- reg_org_phone, - '800-123-1234', -- reg_org_toll_free, - 'internal@gaslightmedia.com', -- reg_org_internal_email, - 'info@gaslightmedia.com', -- reg_org_from_email, - 0, -- reg_payment_methods, - 0, -- reg_proc_methods, - 0, -- reg_cc_accepts, - '', -- reg_authorize_net_login, - '', -- reg_authorize_net_key, - 1, -- reg_authorize_net_test, - true, -- reg_authorize_net_conf - '', -- reg_authorize_net_merchant_email, - '', -- reg_merchant_solutions_acctid, - '', -- reg_merchant_solutions_merchantpin, - 1, -- reg_merchant_solutions_test, - true, -- reg_full_billing_info, - 0, -- reg_bill_info_req_no_charge, - 0, -- reg_bill_info_req_comp_code, - 0, -- reg_bill_info_req_cash, - 0, -- reg_bill_info_req_check, - 0, -- reg_bill_info_req_credit_card, - 0, -- reg_bill_info_req_merchant_call, - true -- reg_medical_info, - ); - ----- - --- Insert into settings_terms table -INSERT INTO {prefix}settings_terms - ( - reg_term_registrations_name, - reg_term_registration, - reg_term_registration_cap, - reg_term_registration_plur, - reg_term_registration_plur_cap, - reg_term_register, - reg_term_register_cap, - reg_term_registers, - reg_term_registering, - reg_term_registering_cap, - reg_term_registered, - reg_term_registered_cap, - reg_term_attendee, - reg_term_attendee_cap, - reg_term_attendee_plur, - reg_term_attendee_plur_cap, - reg_term_attending, - reg_term_attended, - reg_term_registered_user, - reg_term_registered_user_cap, - reg_term_registered_user_plur, - reg_term_registered_user_plur_cap, - reg_term_id, - reg_term_id_cap, - reg_term_id_plur, - reg_term_id_plur_cap, - reg_term_password, - reg_term_password_cap, - reg_term_password_plur, - reg_term_password_plur_cap, - reg_term_instructor, - reg_term_instructor_cap, - reg_term_instructor_plur, - reg_term_instructor_plur_cap, - reg_term_payment_code, - reg_term_payment_code_cap, - reg_term_payment_code_plur, - reg_term_payment_code_plur_cap, - reg_term_registration_button, - reg_term_contact_information - ) - VALUES - ( - 'Event Registrations', -- reg_term_registrations_name - 'registration', -- reg_term_registration - 'Registration', -- reg_term_registration_cap - 'registrations', -- reg_term_registration_plur - 'Registrations', -- reg_term_registration_plur_cap - 'register', -- reg_term_registe - 'Register', -- reg_term_register_cap - 'registers', -- reg_term_registers - 'registering', -- reg_term_registering - 'Registering', -- reg_term_registering_cap - 'registered', -- reg_term_registered - 'Registered', -- reg_term_registered_cap - 'attendee', -- reg_term_attendee - 'Attendee', -- reg_term_attendee_cap - 'attendees', -- reg_term_attendee_plur - 'Attendees', -- reg_term_attendee_plur_cap - 'attending', -- reg_term_attending - 'attended', -- reg_term_attended - 'user', -- reg_term_registered_user - 'User', -- reg_term_registered_user_cap - 'users', -- reg_term_registered_user_plur - 'Users', -- reg_term_registered_user_plur_cap - 'ID', -- reg_term_id - 'ID', -- reg_term_id_cap - 'IDs', -- reg_term_id_plur - 'IDs', -- reg_term_id_plur_cap - 'password', -- reg_term_password - 'passwords', -- reg_term_password_cap - 'Password', -- reg_term_password_plur - 'Passwords', -- reg_term_password_plur_cap - 'instructor', -- reg_term_instructor - 'Instructor', -- reg_term_instructor_cap - 'instructors', -- reg_term_instructor_plur - 'Instructors', -- reg_term_instructor_plur_cap - 'payment code', -- reg_term_payment_code - 'Payment code', -- reg_term_payment_code_cap - 'payment codes', -- reg_term_payment_code_plur - 'Payment codes', -- reg_term_payment_code_plur_cap - 'Register for Event', -- reg_term_registration_button - 'Contact Information' -- reg_term_contact_information - ); - ----- - --- Insert into misc table -INSERT INTO {prefix}misc - ( - reg_bulletin, - cart_page_text, - checkout_page_text, - summary_page_text, - reg_terms, - notify_subject, - notify_text, - instr_notify_subject, - instr_notify_text, - submission_notify_subject, - submission_notify_text, - registrant_notify_subject, - registrant_notify_text, - submission_ack_subject, - submission_ack_text, - registrant_ack_subject, - registrant_ack_text - ) - VALUES - ( - 'Registration Bulletin Text', - 'Text for top of Cart Page', - 'Text for top of Checkout Page', - 'Text for top of Summary Page', - 'Terms and Conditions', - 'Subject of notification to site owner of a registration', - 'Text of notification to site owner of a registration', - 'Subject of notification to instructor of registration', - 'Text for notification to instructor of registration', - 'Subject of notification to person submitting registration', - 'Text of notification to person submitting registration', - 'Subject for notification to registrant', - 'Text for notification to registrant', - 'Subject of acknowledgement to person submitting registration', - 'Text of acknowledgement to person submitting registration', - 'Subject of acknowledgement to registrant', - 'Text of acknowledgement to registrant' - ); diff --git a/setup/databaseScripts/create_database_V0.0.24.sql b/setup/databaseScripts/create_database_V0.0.24.sql new file mode 100644 index 0000000..df14a94 --- /dev/null +++ b/setup/databaseScripts/create_database_V0.0.24.sql @@ -0,0 +1,773 @@ +-- Gaslight Media Registration Database +-- File Created: 01/18/2017 14:40:00 +-- Database Version: 0.0.19 +-- Database Creation Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes +-- +/* + * General Database Organization + * ----------------------------- + * + * management - General options and configuration - Site manager access only + * + * misc - Misc settings and text - Site owner may update + * + * payment codes - Promotional payment codes - Used with various things + * --> Event, Submission, Event Registration, Event Registrant, Account or global + * + * reg_event - Describes registration for that event + * reg_time - One record for each date/time this event has people registered - Primarily tracks attendee counts and charge totals + * reg_class - Type of registration for this event (one or more) + * reg_rates - Date range / rate for a reg class (one or more) + * + * reg_account - Describes someone who submits / pays for a registration + * Make these two things the same table.... + * registrant - A person who is registered for an event + * + * reg_request - Information on a specific request for registrations + * reg_request_event - Event selected (one or more) + * reg_request_class - Class of registration (one or more) + * reg_request_rate - Specific registration date/rate (one or more) + * reg_request_registrant - Registrant (one or more) + * + * NOTE: additional fields and added fields data will be coming from the Custom Fields add-on + * + * Overall Flow + * ------------ + * + * User selects an event + * If the event has available registrations + * User selects a date for the registration (or if only one that's selected automatically) + * User can log back into registrations at this point if they've been there before and have a password, create an ccount, or continue as guest ??? + * User selects an available rate type and adds one or more registrants for that rate type + * User may loop back to select additional rate type(s) and registrants + * User may go back to date selection and request additional rate types and registrants for the addional dates + * User may go back to select additional dates and do registrations for those dates as above + * User may go back to select other events and do registrations for them as above + * User may select the "Cart" and deselect something added to it + * User may checkout + * + */ + +/* + * NOTE: Anything below here may not be completed or accurate yet. I'm still working though this + * Lines commented out are selected for possible deletion. + * The INSERT statements are not up-to-date with the tables. + * The "config/plugin.ini" file in this plugin is also a work in progress. + */ + +-- Management Options +-- General configurationm parameters for the Registrations application +-- Only one entry in this table! +CREATE TABLE {prefix}management ( + id INT NOT NULL AUTO_INCREMENT, + canonical_reg_page TINYTEXT NULL, -- Canonical page slug for registrations + -- System Owner Information + reg_org_name TINYTEXT NULL, -- Customer Information - Name of Organization + reg_org_short TINYTEXT NULL, + reg_org_address TINYTEXT NULL, + reg_org_city TINYTEXT NULL, + reg_org_state TINYTEXT NULL, + reg_org_zip TINYTEXT NULL, + reg_org_phone TINYTEXT NULL, + reg_org_toll_free TINYTEXT NULL, + reg_org_internal_email TINYTEXT NULL, + reg_org_from_email TINYTEXT NULL, + reg_payment_methods SMALLINT NULL, -- Payment methods available for all registrations - Bitmap - see payment_method in plugin.ini + reg_proc_methods SMALLINT NULL, -- Credit Cart payment processing methods available - Bitmap - see proc_method in plugin.ini + reg_cc_accepts SMALLINT NULL, -- Credit Cards Accepted - Bitmap - See credit_card in plugin.ini + -- Authorize.net Credentials + reg_authorize_net_login TINYTEXT NULL, + reg_authorize_net_key TINYTEXT NULL, + reg_authorize_net_test TINYINT NULL, -- Authorize.net test mode - List - see proc_test_mode in plugin.ini + reg_authorize_net_conf BOOLEAN NULL, -- Flag to send payment confirmation Email from Authorize.net + reg_authorize_net_merchant_email TINYTEXT NULL, -- E-Mail Authorize.net will send copy of confirmation E-Mail + -- Merchant Solutions Credentials + reg_merchant_solutions_acctid TINYTEXT NULL, -- Merchant Solutions credentials + reg_merchant_solutions_merchantpin TINYTEXT NULL, + reg_merchant_solutions_test TINYINT NULL, -- Merchant Solutions test mode - List - see proc_test_mode in plugin.ini + reg_merchant_solutions_conf BOOLEAN NULL, -- Flag to send payment confirmation Email + reg_merchant_solutions_merchant_email TINYTEXT NULL, -- Merchant Solutions will send copy of confirmation E-Mail + -- Billing settings + reg_full_billing_info BOOLEAN NULL, -- Always request full billing information in checkout page regardless of the following settings + reg_bill_info_req_no_charge SMALLINT NULL, -- Bitmap of fields to use in checkout for these types of payments - See billing_field in plugin.conf + reg_bill_info_req_comp_code SMALLINT NULL, + reg_bill_info_req_cash SMALLINT NULL, + reg_bill_info_req_check SMALLINT NULL, + reg_bill_info_req_credit_card SMALLINT NULL, + reg_bill_info_req_merchant_call SMALLINT NULL, + -- Misc Options + reg_medical_info BOOLEAN NULL, -- This site can ask for "Medical Info" - set in main category of an event + PRIMARY KEY (id) +); + +---- + +-- Terms used in site modifiable on Management page in admin - Only 1 entry in this table +-- Terms in this table should be all self-explanatory +CREATE TABLE {prefix}settings_terms ( + id INT NOT NULL AUTO_INCREMENT, + reg_term_registrations_name TINYTEXT NULL, -- Term "Event Registration" + reg_term_registration TINYTEXT NULL, + reg_term_registration_cap TINYTEXT NULL, + reg_term_registration_plur TINYTEXT NULL, + reg_term_registration_plur_cap TINYTEXT NULL, + reg_term_register TINYTEXT NULL, + reg_term_register_cap TINYTEXT NULL, + reg_term_registers TINYTEXT NULL, -- Intransitive verb of register + reg_term_registering TINYTEXT NULL, + reg_term_registering_cap TINYTEXT NULL, + reg_term_registered TINYTEXT NULL, + reg_term_registered_cap TINYTEXT NULL, + reg_term_attendee TINYTEXT NULL, + reg_term_attendee_cap TINYTEXT NULL, + reg_term_attendee_plur TINYTEXT NULL, + reg_term_attendee_plur_cap TINYTEXT NULL, + reg_term_attending TINYTEXT NULL, + reg_term_attended TINYTEXT NULL, + reg_term_registered_user TINYTEXT NULL, + reg_term_registered_user_cap TINYTEXT NULL, + reg_term_registered_user_plur TINYTEXT NULL, + reg_term_registered_user_plur_cap TINYTEXT NULL, + reg_term_id TINYTEXT NULL, + reg_term_id_cap TINYTEXT NULL, + reg_term_id_plur TINYTEXT NULL, + reg_term_id_plur_cap TINYTEXT NULL, + reg_term_password TINYTEXT NULL, + reg_term_password_cap TINYTEXT NULL, + reg_term_password_plur TINYTEXT NULL, + reg_term_password_plur_cap TINYTEXT NULL, + reg_term_instructor TINYTEXT NULL, + reg_term_instructor_cap TINYTEXT NULL, + reg_term_instructor_plur TINYTEXT NULL, + reg_term_instructor_plur_cap TINYTEXT NULL, + reg_term_payment_code TINYTEXT NULL, + reg_term_payment_code_cap TINYTEXT NULL, + reg_term_payment_code_plur TINYTEXT NULL, + reg_term_payment_code_plur_cap TINYTEXT NULL, + reg_term_registration_button TINYTEXT NULL, + reg_term_contact_information TINYTEXT NULL, + PRIMARY KEY (id) +); + +---- + +-- Misc system-wide customer configurable configuration +-- Various text and flags to be configured by customer +-- Only one entry in this table! +CREATE TABLE {prefix}misc ( + id INT NOT NULL AUTO_INCREMENT, + reg_bulletin TEXT NULL, -- Text to display at top of first registration page + cart_page_text TEXT NULL, -- Text to display at top of cart page + checkout_page_text TEXT NULL, -- Text to display at top of checkout page + summary_page_text TEXT NULL, -- Text to display at top of summary page (after checkout) + reg_terms TEXT NULL, -- Registration terms and conditions + notify_subject TEXT NULL, -- Subject of notification E-Mail to site owner + notify_text TEXT NULL, -- Notification E-Mail text for site owner + instr_notify_subject TEXT NULL, -- Subject of notification E-Mail to instructor + instr_notify_text TEXT NULL, -- Notification E-Mail text for instructor + submission_notify_subject TEXT NULL, -- Subject of notification E-Mail to person submitting the registrations + submission_notify_text TEXT NULL, -- Notification E-Mail text to person submitting the registrations + registrant_notify_subject TEXT NULL, -- Subject of notification E-Mail to registrant + registrant_notify_text TEXT NULL, -- Text of notification E-Mail to registrant + submission_ack_subject TEXT NULL, -- Subject of acknowledgement E-Mail to person submitting the registrations + submission_ack_text TEXT NULL, -- Text of acknowledgement E-Mail text to person submitting the registrations + registrant_ack_subject TEXT NULL, -- Subject of acknowledgement E-Mail to registrant + registrant_ack_text TEXT NULL, -- Text of acknowledgement E-Mail to registrant + PRIMARY KEY (id) +); + +---- + +-- Payment Codes +-- Promotional payment codes for free/discounted payment +CREATE TABLE {prefix}payment_code ( + id INT NOT NULL AUTO_INCREMENT, + code_type TINYINT NULL, -- Type of adjustment - Free only to start with - See pay_code_type in plugin.ini + ref_type TINYINT NULL, -- See payment_ref_type in plugin.ini + ref_dest INT NULL, -- Pointer to the specific entity of ref_type + code TINYTEXT NULL, -- Text code user must enter to use + amount FLOAT, -- Amount of discount if not type "Free" - Either $ amount or percent + expire_date DATE NULL, -- Expiration Date + descr TEXT NULL, + PRIMARY KEY (id), + INDEX (ref_dest), + INDEX (code(10)) +); + +---- + +-- Registration event specific information +-- One record for each event in Events add-on +-- Only created when an event is selected to offer registrations +CREATE TABLE {prefix}reg_event ( + id INT NOT NULL AUTO_INCREMENT, + event INT NULL, -- Pointer to event in Events add-on - False if event record in Events add-on no longer exists + event_name TINYTEXT NULL, -- Name of Event so it will always be in the cart data + event_code TINYTEXT NULL, -- A short code used to reference this event - can be used to directly select an event to register for + notify_email TINYTEXT NULL, -- E-Mail addresses to receive notification of a registration other than org_internal_email in management, comma separated + admin_active BOOLEAN NULL, -- Active flag for admin from Events - If logged in Admin user for this event and this is true then admin user may enter registrations even if active is off. + active BOOLEAN NULL, -- Active flag to indicate that this event is available for registrations + time_specific BOOLEAN NULL, -- Registration for this event is not date/time specific. Can attend any date/time of event. + attendees BOOLEAN NULL, -- Registration requires attendees - Otherwise the person submitting the registration is the registrant + attendee_max MEDIUMINT NULL, -- Attendee limit - 0 = unlimited + attendee_max_per_reg TINYINT NULL, -- Maximum attendees per registration submission - 0 = unlimited + reg_hold_minutes MEDIUMINT NULL, -- Number of minutes hold time for an inactive cart before registrant count hold expires (after which cart attempts to hold again on next access) + cart_hold_days MEDIUMINT NULL, -- Number of days hold time for inactive cart before cart is purged + reg_hours_before MEDIUMINT NULL, -- Number of hours before an event that is the latest a registration may be submitted. + registration_account_options SMALLINT NULL, -- Bitmap of how user accounts may be used for this event - See registration_account_option in plugin.ini + payment_methods SMALLINT NULL, -- Bitmap of payment methods available to users for this event - See payment_method in plugin.ini + restricted_payment_methods SMALLINT NULL, -- Bitmap of restricted (admin use only) payment methods for this event - see payment_method + descr TEXT NULL, -- Registrations specific description field for this event + terms TEXT NULL, -- Terms and Conditions for registration + first_datetime DATETIME NULL, -- Start of first listed date/time for this event + last_datetime DATETIME NULL, -- Start of last listed date/time for this event + reg_file TINYTEXT NULL, -- Name of a downloadable file + reg_file_title TINYTEXT NULL, -- Title for downloadable file + form_revision SMALLINT NULL, -- Current MagicForm form revision + notes TEXT NULL, -- System operator's notes for this event - Not visible to users + PRIMARY KEY (id), + INDEX (event), + INDEX (event_code(10)) +); + +---- + +-- Registration Event Time - Information and summary data for a specific event instance (relates to a particular time record in events) +-- A pseudo entry is created if registration is not date/time sensitive for this event. The pseudo entry does not point to an event time. +-- These are created the first time a person tries to register for an event instance (time) +-- One or more for each event +CREATE TABLE {prefix}reg_time ( + id INT NOT NULL AUTO_INCREMENT, + active BOOLEAN NULL, -- Flag. True if registrations is available for this time + non_time_specific BOOLEAN NULL, -- Flag. True if this is a pseudo time for non-time-specific events - Other informational times for the event will have this flag off + reg_event INT NULL, -- Pointer to reg_event table + event_time INT NULL, -- ID of events times table entry in Events add-on - If false (0), then this is a pseudo entry to use for all registrations (non-date/time specific) + start_datetime DATETIME NULL, -- Date and time when event instance starts + end_datetime DATETIME NULL, -- Date and time when event instance ends + all_day BOOLEAN NULL, -- All Day flag - Informational + attendees BOOLEAN NULL, -- Flag if tracking attendees or if only one per registration submission (registers account submitting) - get from reg_event + attendee_max MEDIUMINT NULL, -- Attendee count limit - 0 = unlimited - get from reg_event record + attendee_count MEDIUMINT NULL, -- Current attendee count - calculated on the fly and stored here for reference + attendees_pending MEDIUMINT NULL, -- Current number of attendees for this time in active pending carts (Not checked out and attendees slots held) + attendees_available MEDIUMINT NULL, -- Currently available attendee count (limit - current - pending) + total_base_charge DOUBLE NULL, -- Total base charges + total_per_attendee DOUBLE NULL, -- Total per-attendee charges + total_other DOUBLE NULL, -- Total other charges (meals, extras, fees, ...) + total_taxes DOUBLE NULL, -- Total taxes charged + total_charges DOUBLE NULL, -- Total charges (sum of all above) + total_discounts DOUBLE NULL, -- Total discounts of all types (applied payment codes, etc...) + total_payments DOUBLE NULL, -- Total net payments (total charges - total discounts) + descr TEXT NULL, -- Optional description field for this time entry + PRIMARY KEY (id), + INDEX (reg_event), + INDEX (event_time), + INDEX (start_datetime) +); + +---- + +-- Pending Attendees - In carts but not checked out +-- Attendee counts may be held for a particular reg_time entry for carts that have not been checked out +-- These are held for reg_event reg_hold_minutes, afterwhich they are timed out and removed from this table +-- Cart entries are given the ID's for these entries when a hold is requested, if the entry is gone, the hold has expired +CREATE TABLE {prefix}reg_time_pending ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event table + reg_time INT NULL, -- ID of time record + registrant INT NULL, -- ID of reg_request_registrant record -- + expire_time DATETIME NULL, -- Time at which this hold expires + PRIMARY KEY (id), + INDEX (reg_event), + INDEX (reg_time) +); + +---- + +-- Registration Class - Type of registration for a specific event - Equates to "Rate Options" in the old system +-- One or more for each event +CREATE TABLE {prefix}reg_class ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event table + name TINYTEXT NULL, -- Name of this registration type + descr TEXT NULL, -- Description + PRIMARY KEY (id), + INDEX (reg_event) +); + +---- + +-- Rates and dates for a particular reg_class +-- One or more per reg_class - **** Days should not overlap for a particular reg_class +CREATE TABLE {prefix}reg_rate ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event table + reg_class INT NULL, -- Pointer to reg_class table + name TINYTEXT NULL, -- Name of this rate + start_days INT NULL, -- # of days before event time rate becomes available - may be selected as a date then converted for storage + end_days INT NULL, -- # of days before event time rate becomes unavailable + base_rate FLOAT, -- Base rate to register + per_registrant FLOAT, -- Rate per registrant + registrant_credits TINYINT NULL, -- Number of registrants included in base rate + PRIMARY KEY (id), + INDEX (reg_event), + INDEX (reg_class) +); + +---- + +-- Notifications +-- None or more for each reg event +CREATE TABLE {prefix}reg_notification ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event table + name TINYTEXT NULL, -- Name of this notification + notification_days INT NULL, -- # of days before or after event that notification takes place (- before, + after) + message TEXT NULL, -- Content of message (uses template parameters to merge event/attendee data) + PRIMARY KEY (id), + INDEX (reg_event) +); + +---- + +-- Notification Queue +CREATE TABLE {prefix}notification_queue ( + id INT NOT NULL AUTO_INCREMENT, + reg_notification INT NOT NULL, -- Pointer to the reg_notification table + account INT NOT NULL, -- Pointer to the account table + queued_time DATETIME NOT NULL, -- Creation time + processed_time DATETIME NULL, -- The time this queue was processed. (sent out) + to_email TINYTEXT NOT NULL, -- The To email address + from_email TINYTEXT NOT NULL, -- The From email address + subject TINYTEXT NOT NULL, -- The subject + html_message TEXT NOT NULL, -- The complete html message + PRIMARY KEY (id) +); + +---- + +-- An account for a person submitting a registration or a registrant for an event +-- Depending on the use of these entries may not have all data included +-- A single account may be referenced as a person submitting registrations and/or a person registered for an event +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 + lname TINYTEXT NULL, + org TINYTEXT NULL, + title TINYTEXT NULL, + addr1 TINYTEXT NULL, + addr2 TINYTEXT NULL, + city TINYTEXT NULL, + state TINYTEXT NULL, + zip TINYTEXT NULL, + country TINYTEXT NULL, + phone TINYTEXT NULL, + fax TINYTEXT NULL, + bill_fname TINYTEXT NULL, -- Last used billing information - Also stored in each registration request + bill_lname TINYTEXT NULL, + bill_org TINYTEXT NULL, + bill_title TINYTEXT NULL, + bill_addr1 TINYTEXT NULL, + bill_addr2 TINYTEXT NULL, + bill_city TINYTEXT NULL, + bill_state TINYTEXT NULL, + bill_zip TINYTEXT NULL, + bill_country TINYTEXT NULL, + bill_phone TINYTEXT NULL, + bill_fax TINYTEXT NULL, + email TINYTEXT NULL, + password TINYTEXT NULL, -- Crypted password for login back into this account + email_ok BOOLEAN NULL, + is_member BOOLEAN NULL, -- Is a member of the entity that owns the site + contact_id INT NULL, -- Pointer to GLM Associate member contact record if account is for a member contact + contact_fname TINYTEXT NULL, + contact_lname TINYTEXT NULL, + contact_org TINYTEXT NULL, + contact_title TINYTEXT NULL, + contact_addr1 TINYTEXT NULL, + contact_addr2 TINYTEXT NULL, + contact_city TINYTEXT NULL, + contact_state TINYTEXT NULL, + contact_zip TINYTEXT NULL, + contact_country TINYTEXT NULL, + contact_phone TINYTEXT NULL, + contact_fax TINYTEXT NULL, + contact_email TINYTEXT NULL, + contact_email_ok BOOLEAN NULL, + guardian TINYTEXT NULL, + emer_contact TINYTEXT NULL, + emer_phone TINYTEXT NULL, + med_history TINYTEXT NULL, + allergy_med TINYTEXT NULL, + date_created DATE NULL, + notes TEXT NULL, -- System operator's notes for this account - not visible to account owner + user_trace_info TINYTEXT NULL, -- IP Address of user computer and timestamp of last update + PRIMARY KEY (id), + INDEX (registered_by), + INDEX (member_id(10)), + INDEX (fname(10)), + INDEX (lname(10)), + INDEX (org(10)), + INDEX (city(10)), + INDEX (state(5)), + INDEX (zip(5)), + INDEX (email(10)), + INDEX (contact_id) +); + +---- + +-- A request for registration +-- Has one or more reg_detail records associated with it +CREATE TABLE {prefix}reg_request ( + id INT NOT NULL AUTO_INCREMENT, + account INT NULL, -- Pointer to user account (reg_account) who submitted the registrations. If 0 then guest request (prior to checkout) + validated BOOLEAN NULL, -- Flag that indicates if request passed last validation with checkRegistrationRequest() + validation_message TEXT NULL, -- Reasons that request did not pass validation with checkRegistrationRequest() - Serialized array + bill_fname TINYTEXT NULL, -- Billing information used for this registration submission - Updates account billing address - Kept here for each request + bill_lname TINYTEXT NULL, + bill_org TINYTEXT NULL, + bill_title TINYTEXT NULL, + bill_addr1 TINYTEXT NULL, + bill_addr2 TINYTEXT NULL, + bill_city TINYTEXT NULL, + bill_state TINYTEXT NULL, + bill_zip TINYTEXT NULL, + bill_country TINYTEXT NULL, + bill_phone TINYTEXT NULL, + bill_email TINYTEXT NULL, + date_submitted DATE NULL, -- Date of final submission (checkout complete) + pay_method INT NULL, -- See payment_method in plugin.ini + payment_code TINYTEXT NULL, -- Payment_code text (comp code) - if submitted and validated + status SMALLINT NULL, -- See submission_status in plugin.ini + total DOUBLE PRECISION NULL, -- Total charge including all fees and taxes + total_discounts DOUBLE PRECISION NULL, -- Total of all comps and discounts + registrants SMALLINT NULL, -- Total number of registrants in this cart + cc_type TINYINT NULL, -- Credit Card type (if used) - See credit_card in plugin.ini + cc_name TINYTEXT NULL, + cc_numb TINYTEXT NULL, + cc_exp TINYTEXT NULL, + cc_cvv TINYTEXT NULL, + cc_conf TINYTEXT NULL, -- Confirmation code back from card processor + cc_proc_mesg TINYTEXT NULL, -- Message received from payment processor + summary TEXT NULL, -- HTML summary of cart contents, costs and payment - Use same HTML displayed to user + mf_data TEXT NULL, -- Any MagicForm data associated with registrant + notes TEXT NULL, -- System operator's notes for this registration request + user_trace_info TEXT NULL, -- IP Address of user computer and timestamp + date_created DATETIME NULL, -- Date request was first created + last_update DATETIME NULL, -- Last update date/time - Used for timing out pending carts and attendee counts + PRIMARY KEY (id), + INDEX (account), + INDEX (date_submitted) +); + +---- + +-- Registration for a specific event +-- Has one or more reg_selected_rate records associated with it +CREATE TABLE {prefix}reg_request_event ( + id INT NOT NULL AUTO_INCREMENT, + reg_request INT NULL, -- Pointer to reg_request table + reg_event INT NULL, -- Pointer to reg_event + event_name TINYTEXT NULL, -- Name of Event so it will always be in the cart data + notes TEXT NULL, -- System operator's notes for this registration request + PRIMARY KEY (id), + INDEX (reg_request), + INDEX (reg_event) +); + +---- + +-- A particular reg_class selected +-- Has one or more reg_request_rate records associated with it +CREATE TABLE {prefix}reg_request_class ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event entry + reg_request INT NULL, -- Pointer to the registration request record + reg_request_event INT NULL, -- Pointer to reg_request_event table entry + class INT NULL, -- Pointer to event reg_class table - False (0) if registration class no longer exits + class_name TINYTEXT NULL, -- Name of event class at the time selected + notes TEXT NULL, -- System operator's notes for this registration request + PRIMARY KEY (id), + INDEX (reg_event), + INDEX (reg_request_event) +); + +---- + +-- A particular reg_rate selected +-- Has one or more reg_request_registrant records associated with it +CREATE TABLE {prefix}reg_request_rate ( + id INT NOT NULL AUTO_INCREMENT, + reg_event INT NULL, -- Pointer to reg_event entry + reg_request INT NULL, -- Pointer to the registration request record + reg_request_event INT NULL, -- Pointer to reg_request_event table entry + reg_request_class INT NULL, -- Pointer to reg_request_class table entry + rate INT NULL, -- Pointer to event reg_rate table - False (0) if registration rate no longer exists + rate_name TINYTEXT NULL, -- Name of event class rate at the time selected + base_rate FLOAT, -- Base rate at time of registration + per_registrant FLOAT, -- Per Registrant Rate at time of registration + registrant_credits TINYINT NULL, -- Number of registrants included in base rate at time of registration + notes TEXT NULL, -- System operator's notes for this registration request + PRIMARY KEY (id), + INDEX (reg_event), + INDEX (reg_request_event), + INDEX (reg_request_class) +); + +---- + +-- A specific registrant for a selected registration rate +CREATE TABLE {prefix}reg_request_registrant ( + id INT NOT NULL AUTO_INCREMENT, + account INT NULL, -- Pointer to the account entry for the person being registered - False (0) if account no longer exists or registrant account not needed + reg_event INT NULL, -- Pointer to reg_event entry + reg_time INT NULL, -- Pointer reg_time entry + event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart + reg_request INT NULL, -- Pointer to the registration request record + reg_request_event INT NULL, -- Pointer to reg_request_event table entry + reg_request_class INT NULL, -- Pointer to reg_request_class table entry + reg_request_rate INT NULL, -- Pointer to reg_request_rate table entry + not_attending BOOLEAN DEFAULT false, -- Flag to say if registrant is not attending - set to true when not attending + fname TINYTEXT NULL, -- First name of registrant at the time of selection + lname TINYTEXT NULL, -- Last name of registrant at the time of selection + notes TEXT NULL, -- System operator's notes for this registration request + PRIMARY KEY (id), + INDEX (account), + INDEX (reg_event), + INDEX (reg_time), + INDEX (reg_request), + INDEX (reg_request_event), + INDEX (reg_request_class), + INDEX (reg_request_rate) +); + +---- + +-- A specific use of a payment code in this request +CREATE TABLE {prefix}reg_request_pay_code ( + id INT NOT NULL AUTO_INCREMENT, + payment_code INT NULL, -- Pointer to payment code + code TINYTEXT NULL, -- Copy of Payment Code text in case payment code is deleted or changed + reg_request INT NULL, -- Pointer to the registration request record + credit DOUBLE PRECISION NULL, -- Total credit for this payment code + expire_date DATE NULL, -- Expiration Date - NOT USING NOW - Getting from payment_code table always + PRIMARY KEY (id), + INDEX (payment_code), + INDEX (reg_request) +); + +---- + +-- Insert into management table +INSERT INTO {prefix}management + ( + canonical_reg_page, + reg_org_name, + reg_org_short, + reg_org_address, + reg_org_city, + reg_org_state, + reg_org_zip, + reg_org_phone, + reg_org_toll_free, + reg_org_internal_email, + reg_org_from_email, + reg_payment_methods, + reg_proc_methods, + reg_cc_accepts, + reg_authorize_net_login, + reg_authorize_net_key, + reg_authorize_net_test, + reg_authorize_net_conf, + reg_authorize_net_merchant_email, + reg_merchant_solutions_acctid, + reg_merchant_solutions_merchantpin, + reg_merchant_solutions_test, + reg_full_billing_info, + reg_bill_info_req_no_charge, + reg_bill_info_req_comp_code, + reg_bill_info_req_cash, + reg_bill_info_req_check, + reg_bill_info_req_credit_card, + reg_bill_info_req_merchant_call, + reg_medical_info + ) + VALUES + ( + 'registrations', -- reg_canonical_reg_page, + 'Gaslight Media', -- reg_org_name, + 'GLM', -- reg_org_short, + '120 E. Lake St.', -- reg_org_address, + 'Petoskey', -- reg_org_city, + 'MI', -- reg_org_state, + '49770', -- reg_org_zip, + '231-487-0692', -- reg_org_phone, + '800-123-1234', -- reg_org_toll_free, + 'internal@gaslightmedia.com', -- reg_org_internal_email, + 'info@gaslightmedia.com', -- reg_org_from_email, + 0, -- reg_payment_methods, + 0, -- reg_proc_methods, + 0, -- reg_cc_accepts, + '', -- reg_authorize_net_login, + '', -- reg_authorize_net_key, + 1, -- reg_authorize_net_test, + true, -- reg_authorize_net_conf + '', -- reg_authorize_net_merchant_email, + '', -- reg_merchant_solutions_acctid, + '', -- reg_merchant_solutions_merchantpin, + 1, -- reg_merchant_solutions_test, + true, -- reg_full_billing_info, + 0, -- reg_bill_info_req_no_charge, + 0, -- reg_bill_info_req_comp_code, + 0, -- reg_bill_info_req_cash, + 0, -- reg_bill_info_req_check, + 0, -- reg_bill_info_req_credit_card, + 0, -- reg_bill_info_req_merchant_call, + true -- reg_medical_info, + ); + +---- + +-- Insert into settings_terms table +INSERT INTO {prefix}settings_terms + ( + reg_term_registrations_name, + reg_term_registration, + reg_term_registration_cap, + reg_term_registration_plur, + reg_term_registration_plur_cap, + reg_term_register, + reg_term_register_cap, + reg_term_registers, + reg_term_registering, + reg_term_registering_cap, + reg_term_registered, + reg_term_registered_cap, + reg_term_attendee, + reg_term_attendee_cap, + reg_term_attendee_plur, + reg_term_attendee_plur_cap, + reg_term_attending, + reg_term_attended, + reg_term_registered_user, + 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, + reg_term_id_plur_cap, + reg_term_password, + reg_term_password_cap, + reg_term_password_plur, + reg_term_password_plur_cap, + reg_term_instructor, + reg_term_instructor_cap, + reg_term_instructor_plur, + reg_term_instructor_plur_cap, + reg_term_payment_code, + reg_term_payment_code_cap, + reg_term_payment_code_plur, + reg_term_payment_code_plur_cap, + reg_term_registration_button, + reg_term_contact_information + ) + VALUES + ( + 'Event Registrations', -- reg_term_registrations_name + 'registration', -- reg_term_registration + 'Registration', -- reg_term_registration_cap + 'registrations', -- reg_term_registration_plur + 'Registrations', -- reg_term_registration_plur_cap + 'register', -- reg_term_registe + 'Register', -- reg_term_register_cap + 'registers', -- reg_term_registers + 'registering', -- reg_term_registering + 'Registering', -- reg_term_registering_cap + 'registered', -- reg_term_registered + 'Registered', -- reg_term_registered_cap + 'attendee', -- reg_term_attendee + 'Attendee', -- reg_term_attendee_cap + 'attendees', -- reg_term_attendee_plur + 'Attendees', -- reg_term_attendee_plur_cap + 'attending', -- reg_term_attending + 'attended', -- reg_term_attended + 'user', -- reg_term_registered_user + 'User', -- reg_term_registered_user_cap + 'users', -- reg_term_registered_user_plur + 'Users', -- reg_term_registered_user_plur_cap + 'ID', -- reg_term_id + 'ID', -- reg_term_id_cap + 'IDs', -- reg_term_id_plur + 'IDs', -- reg_term_id_plur_cap + 'password', -- reg_term_password + 'passwords', -- reg_term_password_cap + 'Password', -- reg_term_password_plur + 'Passwords', -- reg_term_password_plur_cap + 'instructor', -- reg_term_instructor + 'Instructor', -- reg_term_instructor_cap + 'instructors', -- reg_term_instructor_plur + 'Instructors', -- reg_term_instructor_plur_cap + 'payment code', -- reg_term_payment_code + 'Payment code', -- reg_term_payment_code_cap + 'payment codes', -- reg_term_payment_code_plur + 'Payment codes', -- reg_term_payment_code_plur_cap + 'Register for Event', -- reg_term_registration_button + 'Contact Information' -- reg_term_contact_information + ); + +---- + +-- Insert into misc table +INSERT INTO {prefix}misc + ( + reg_bulletin, + cart_page_text, + checkout_page_text, + summary_page_text, + reg_terms, + notify_subject, + notify_text, + instr_notify_subject, + instr_notify_text, + submission_notify_subject, + submission_notify_text, + registrant_notify_subject, + registrant_notify_text, + submission_ack_subject, + submission_ack_text, + registrant_ack_subject, + registrant_ack_text + ) + VALUES + ( + 'Registration Bulletin Text', + 'Text for top of Cart Page', + 'Text for top of Checkout Page', + 'Text for top of Summary Page', + 'Terms and Conditions', + 'Subject of notification to site owner of a registration', + 'Text of notification to site owner of a registration', + 'Subject of notification to instructor of registration', + 'Text for notification to instructor of registration', + 'Subject of notification to person submitting registration', + 'Text of notification to person submitting registration', + 'Subject for notification to registrant', + 'Text for notification to registrant', + 'Subject of acknowledgement to person submitting registration', + 'Text of acknowledgement to person submitting registration', + 'Subject of acknowledgement to registrant', + 'Text of acknowledgement to registrant' + ); 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.22.sql deleted file mode 100644 index 2ac0fe3..0000000 --- a/setup/databaseScripts/drop_database_V0.0.22.sql +++ /dev/null @@ -1,26 +0,0 @@ --- Gaslight Media Members Database --- File Created: 12/09/14 15:27:15 --- Database Version: 0.0.19 --- Database Deletion Script --- Note: Tables with DELETE CASCADE must appear before referenced table - -DROP TABLE IF EXISTS - {prefix}management, - {prefix}settings_terms, - {prefix}misc, - {prefix}payment_code, - {prefix}reg_event, - {prefix}reg_time, - {prefix}reg_time_pending, - {prefix}reg_class, - {prefix}reg_rate, - {prefix}reg_notification, - {prefix}account, - {prefix}reg_request, - {prefix}reg_request_event, - {prefix}reg_request_class, - {prefix}reg_request_rate, - {prefix}reg_request_registrant, - {prefix}reg_request_pay_code -; - diff --git a/setup/databaseScripts/drop_database_V0.0.24.sql b/setup/databaseScripts/drop_database_V0.0.24.sql new file mode 100644 index 0000000..2ac0fe3 --- /dev/null +++ b/setup/databaseScripts/drop_database_V0.0.24.sql @@ -0,0 +1,26 @@ +-- Gaslight Media Members Database +-- File Created: 12/09/14 15:27:15 +-- Database Version: 0.0.19 +-- Database Deletion Script +-- Note: Tables with DELETE CASCADE must appear before referenced table + +DROP TABLE IF EXISTS + {prefix}management, + {prefix}settings_terms, + {prefix}misc, + {prefix}payment_code, + {prefix}reg_event, + {prefix}reg_time, + {prefix}reg_time_pending, + {prefix}reg_class, + {prefix}reg_rate, + {prefix}reg_notification, + {prefix}account, + {prefix}reg_request, + {prefix}reg_request_event, + {prefix}reg_request_class, + {prefix}reg_request_rate, + {prefix}reg_request_registrant, + {prefix}reg_request_pay_code +; + 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}
IDDate createdDate last updatedEventsRegistrantsSelected
IDDate createdDate last updated{$terms.reg_term_event_plur_cap}RegistrantsSelected