Added configurable terms for buttons on front-end registrations pages.
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 15 May 2018 20:17:54 +0000 (16:17 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 15 May 2018 20:17:54 +0000 (16:17 -0400)
Added database fields for button texts.

12 files changed:
classes/data/dataSettingsTerms.php
index.php
setup/databaseScripts/create_database_V0.0.30.sql [deleted file]
setup/databaseScripts/dbVersions.php
setup/databaseScripts/drop_database_V0.0.30.sql [deleted file]
setup/databaseScripts/update_database_V0.0.31.sql [new file with mode: 0644]
views/admin/management/regterms.html
views/front/registrations/accountHeader.html
views/front/registrations/cart.html
views/front/registrations/checkout.html
views/front/registrations/login.html
views/front/registrations/registration.html

index 955e80e..b9223d1 100644 (file)
@@ -490,6 +490,96 @@ class GlmDataRegistrationsSettingsTerms extends GlmDataAbstract
                 'type' => 'text',
                 'required' => true,
                 'use' => 'a'
+            ),
+
+            /*** BUTTONS ***/
+
+            // Button - Event List
+            'reg_term_button_event_list' => array (
+                'field' => 'reg_term_button_event_list',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Login or Create Account
+            'reg_term_button_login_or_create' => array (
+                'field' => 'reg_term_button_login_or_create',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Create Account
+            'reg_term_button_create_account' => array (
+                'field' => 'reg_term_button_create_account',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Login
+            'reg_term_button_login' => array (
+                'field' => 'reg_term_button_login',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Logout
+            'reg_term_button_logout' => array (
+                'field' => 'reg_term_button_logout',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Add Attendee
+            'reg_term_button_add_attendee' => array (
+                'field' => 'reg_term_button_add_attendee',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Save Attendee
+            'reg_term_button_save_attendee' => array (
+                'field' => 'reg_term_button_save_attendee',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Attendee Page Continue
+            'reg_term_button_attendee_page_continue' => array (
+                'field' => 'reg_term_button_attendee_page_continue',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Apply Comp Code
+            'reg_term_button_apply_comp_code' => array (
+                'field' => 'reg_term_button_apply_comp_code',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Cart Page Continue
+            'reg_term_button_cart_page_continue' => array (
+                'field' => 'reg_term_button_cart_page_continue',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
+            ),
+
+            // Button - Checkout Page Submit
+            'reg_term_button_checkout_page_submit' => array (
+                'field' => 'reg_term_button_checkout_page_submit',
+                'type' => 'text',
+                'required' => true,
+                'use' => 'a'
             )
 
         );
index 4a93e0b..10137cc 100644 (file)
--- 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.30');
+define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '0.0.31');
 
 // 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.27');
diff --git a/setup/databaseScripts/create_database_V0.0.30.sql b/setup/databaseScripts/create_database_V0.0.30.sql
deleted file mode 100644 (file)
index 37eff7e..0000000
+++ /dev/null
@@ -1,795 +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
-    reg_authorize_net_merchant_seal TEXT NULL,                      -- Authorize.net Verified Merchant Seal code
-    -- 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_request_hold_days SMALLINT NULL,                            -- Number of days past last update that a request will be retained in "CART" status.
-    req_account_hold_days SMALLINT NULL,                            -- Number of days past last update that an account will be retained when there are no requests or registrants referring to it.
-    reg_not_submitted_dialog BOOLEAN NULL,                          -- Flag to show page not submitted dialog boxes
-    reg_medical_info BOOLEAN NULL,                                  -- This site can ask for "Medical Info" - set in main category of an event
-    reg_show_navigation_aids BOOLEAN NULL,                          -- No, not marine navigational aids, this enables additional text, arrows, etc to direct a user to do something specific that would not normally be required.
-    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_event TINYTEXT NULL,
-    reg_term_event_cap TINYTEXT NULL,
-    reg_term_event_plur TINYTEXT NULL,
-    reg_term_event_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_level TINYTEXT NULL,
-    reg_term_level_cap TINYTEXT NULL,
-    reg_term_level_plur TINYTEXT NULL,
-    reg_term_level_plur_cap TINYTEXT NULL,
-    reg_term_password TINYTEXT NULL,
-    reg_term_password_cap TINYTEXT NULL,
-    reg_term_password_plur TINYTEXT NULL,
-    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 and notifications
-    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,                              -- NO LONGER IN USE - 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 - See "contact_member_id" below)
-    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 infodeletermation - 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
-    customer_profile_id TINYTEXT NULL,                          -- Stored Credit Card customer profile ID
-    payment_profile_id TINYTEXT NULL,                           -- Stored Credit Card payment profile ID
-    payment_profile_card TINYTEXT NULL,                         -- Stored Credit Card last card digits
-    contact_id INT NULL,                                        -- Pointer to GLM Associate member contact record if account is for a member contact
-    contact_member_id INT NULL,                                 -- Pointer to GLM Associate Member for this 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,                                      -- Name on Credit Card or Name on Check
-    cc_numb TINYTEXT NULL,                                      -- Credit Card Number or Check Number
-    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
-    'event',                                                    -- reg_term_event
-    'Event',                                                    -- reg_term_event_cap
-    'events',                                                   -- reg_term_event_plur
-    'Events',                                                   -- reg_term_event_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'
-    );
index 9e43b5e..8775429 100644 (file)
@@ -43,7 +43,8 @@ $glmMembersRegistrationsDbVersions = array(
     '0.0.27' => array('version' => '0.0.27', 'tables' => 18, 'date' => '04/05/2018'),
     '0.0.28' => array('version' => '0.0.28', 'tables' => 18, 'date' => '04/12/2018'),
     '0.0.29' => array('version' => '0.0.29', 'tables' => 18, 'date' => '05/04/2018'),
-    '0.0.30' => array('version' => '0.0.30', 'tables' => 18, 'date' => '05/14/2018')
+    '0.0.30' => array('version' => '0.0.30', 'tables' => 18, 'date' => '05/14/2018'),
+    '0.0.31' => array('version' => '0.0.31', 'tables' => 18, 'date' => '05/15/2018')
 );
 
 
diff --git a/setup/databaseScripts/drop_database_V0.0.30.sql b/setup/databaseScripts/drop_database_V0.0.30.sql
deleted file mode 100644 (file)
index 2ac0fe3..0000000
+++ /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/update_database_V0.0.31.sql b/setup/databaseScripts/update_database_V0.0.31.sql
new file mode 100644 (file)
index 0000000..7029af4
--- /dev/null
@@ -0,0 +1,67 @@
+-- Gaslight Media Members Database  - Registratiuons Add-On
+-- File Updated: 2018-04-12
+-- Database Version: 0.0.30
+-- 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_button_event_list TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_login_or_create TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_create_account TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_login TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_logout TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_add_attendee TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_save_attendee TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_attendee_page_continue TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_apply_comp_code TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_cart_page_continue TINYTEXT;
+
+----
+
+ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_button_checkout_page_submit TINYTEXT;
+
+----
+
+UPDATE {prefix}settings_terms 
+   SET reg_term_button_event_list = 'Event Registration List',
+       reg_term_button_login_or_create = 'Login or Create Account',
+       reg_term_button_create_account = 'Create an Account',
+       reg_term_button_login = 'Login',
+       reg_term_button_logout = 'Logout',
+       reg_term_button_add_attendee = 'Add New Attendee',
+       reg_term_button_save_attendee = 'Save Attendee',
+       reg_term_button_attendee_page_continue = 'Continue',
+       reg_term_button_apply_comp_code = 'Apply Comp Code',
+       reg_term_button_cart_page_continue = 'Proceed to Checkout',
+       reg_term_button_checkout_page_submit = 'Submit Registration Request'
+;
+
+
index 446251d..992d82a 100644 (file)
@@ -5,22 +5,23 @@
     <a href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=regterms" class="glm-settings-tab nav-tab nav-tab-active">Terms and Phrases</a>
 </h2>
 
-<table class="glm-admin-table glm-settings-table">
-    <tr>
-        <td colspan="2">
-            {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Settings Updated</h2>{/if}
-            {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
-            <h3>{$terms.reg_term_registrations_name} Terms and Phrases</h3>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
-                <input type="hidden" name="glm_action" value="regterms">
-                <input type="hidden" name="option" value="submit">
+<form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
+    <input type="hidden" name="glm_action" value="regterms">
+    <input type="hidden" name="option" value="submit">
+
+    <table class="glm-admin-table glm-settings-table">
+        <tr>
+            <td colspan="2">
+                {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Settings Updated</h2>{/if}
+                {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
+                <h3>{$terms.reg_term_registrations_name} Terms and Phrases</h3>
+                            
+            </td>
+        </tr>
+        <tr>
+            <td>
                 <table>
-                
-                
+
                     <!-- APPLICATION TITLE -->
                     <tr>
                         <th colspan="2" {if $termSettings.fieldRequired.reg_term_registrations_name}class="glm-required"{/if}>Application Title:</th>
                             {if $termSettings.fieldFail.reg_term_registration_plur_cap}<p>{$termSettings.fieldFail.reg_term_registration_plur_cap}</p>{/if}
                         </td>
                     </tr>
-                
+                                    
                 </table>
-                <input type="submit" value="Update Settings" class="button button-primary">
-            </form>
-        </td>
-    </tr>
-</table>
+            </td>
+            <td>
+                <table>
+                    <!-- Button Text -->
+                    <tr><td colspan="2"><p>NOTE: Please try to keep text for the buttons below very short and verify how they look when you're done!</p></td></tr> 
+                    <tr><td>&nbsp;</td><th><h2>Buttons at top of all pages</h2></th></tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_event_list}class="glm-required"{/if}>List Events:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_event_list}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_event_list" value="{$termSettings.fieldData.reg_term_button_event_list}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_event_list}<p>{$termSettings.fieldFail.reg_term_button_event_list}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_login_or_create}class="glm-required"{/if}>Login or Create Account:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_login_or_create}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_login_or_create" value="{$termSettings.fieldData.reg_term_button_login_or_create}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_login_or_create}<p>{$termSettings.fieldFail.reg_term_button_login_or_create}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_create_account}class="glm-required"{/if}>Create Account:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_create_account}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_create_account" value="{$termSettings.fieldData.reg_term_button_create_account}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_create_account}<p>{$termSettings.fieldFail.reg_term_button_create_account}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_login}class="glm-required"{/if}>Login:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_login}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_login" value="{$termSettings.fieldData.reg_term_button_login}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_login}<p>{$termSettings.fieldFail.reg_term_button_login}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_logout}class="glm-required"{/if}>Logout:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_logout}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_logout" value="{$termSettings.fieldData.reg_term_button_logout}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_logout}<p>{$termSettings.fieldFail.reg_term_button_logout}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr><td>&nbsp;</td><th><br><h2>Buttons on Add/Edit Attendees Page</h2></th></tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_add_attendee}class="glm-required"{/if}>Add Attendee:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_add_attendee}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_add_attendee" value="{$termSettings.fieldData.reg_term_button_add_attendee}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_add_attendee}<p>{$termSettings.fieldFail.reg_term_button_add_attendee}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_save_attendee}class="glm-required"{/if}>Save Attendee:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_save_attendee}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_save_attendee" value="{$termSettings.fieldData.reg_term_button_save_attendee}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_save_attendee}<p>{$termSettings.fieldFail.reg_term_button_save_attendee}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_attendee_page_continue}class="glm-required"{/if}>Continue to Cart Page:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_attendee_page_continue}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_attendee_page_continue" value="{$termSettings.fieldData.reg_term_button_attendee_page_continue}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_attendee_page_continue}<p>{$termSettings.fieldFail.reg_term_button_attendee_page_continue}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr><td>&nbsp;</td><th><br><h2>Buttons on Cart Page</h2></th></tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_apply_comp_code}class="glm-required"{/if}>Apply Comp Code:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_apply_comp_code}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_apply_comp_code" value="{$termSettings.fieldData.reg_term_button_apply_comp_code}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_apply_comp_code}<p>{$termSettings.fieldFail.reg_term_button_apply_comp_code}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_cart_page_continue}class="glm-required"{/if}>Continue to Checkout Page:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_cart_page_continue}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_cart_page_continue" value="{$termSettings.fieldData.reg_term_button_cart_page_continue}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_cart_page_continue}<p>{$termSettings.fieldFail.reg_term_button_cart_page_continue}</p>{/if}
+                        </td>
+                    </tr>
+                    <tr><td>&nbsp;</td><th><br><h2>Buttons on Checkout Page</h2></th></tr>
+                    <tr>
+                        <th {if $termSettings.fieldRequired.reg_term_button_checkout_page_submit}class="glm-required"{/if}>Submit Checkout Page:</th>
+                        <td {if $termSettings.fieldFail.reg_term_button_checkout_page_submit}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_term_button_checkout_page_submit" value="{$termSettings.fieldData.reg_term_button_checkout_page_submit}" class="glm-form-text-input-medium">
+                            {if $termSettings.fieldFail.reg_term_button_checkout_page_submit}<p>{$termSettings.fieldFail.reg_term_button_checkout_page_submit}</p>{/if}
+                        </td>
+                    </tr>
+                </table>            
+            </td>
+            
+        </tr>
+    </table>
+    <input type="submit" value="Update Settings" class="button button-primary">
+</form>
+
 {include file='admin/management/footer.html'}
index 5076dcb..574affb 100644 (file)
@@ -2,7 +2,7 @@
 
     <div id="accountHeader-left" class="accountHeader-section small-12 medium-12 medium-centered large-4 large-uncentered columns">
         <a id="accountHeader-list-link" href="{$regUrl}" class="button glm-reg-header-btn">
-            <span>{$terms.reg_term_event_cap} {$terms.reg_term_registration_cap} List</span>
+            <span>{$terms.reg_term_button_event_list}</span>
         </a>
 
     </div>
@@ -68,7 +68,7 @@
         </div>
     {else}
         <a class="button glm-reg-header-btn" href="{$regUrl}?page=login">
-            <span>Login or Create Account</span>
+            <span>{$terms.reg_term_button_login_or_create}</span>
         </a>
 
     {/if}
index 3c16338..8ea2420 100644 (file)
@@ -58,7 +58,7 @@
         <form href="{$regUrl}?page=cart" method="post">
             If you have a "Comp Code", please enter it here: 
             <input type="text" name="regPaymentCode" style="width: 10rem; display: inline;">
-            <input type="submit" class="button button-secondary glm-button" style="font-size: .8rem;" name="applyPaymentCode" value="Apply Comp Code">
+            <input type="submit" class="button button-secondary glm-button" style="font-size: .8rem;" name="applyPaymentCode" value="{$terms.reg_term_button_apply_comp_code}">
         </form>
         {assign var="codeSep" value=""}
         {if $cart.payCodes}
@@ -82,7 +82,7 @@
     {if $settings.reg_show_navigation_aids}
         <div class="glm-reg-warning">You have not yet submitted your {$terms.reg_term_registration}! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> 
     {/if}
-        <a href="{$regUrl}?page=checkout" class="glm-reg-checkout button glm-reg-button">Proceed to Checkout</a></div>
+        <a href="{$regUrl}?page=checkout" class="glm-reg-checkout button glm-reg-button">{$terms.reg_term_button_cart_page_continue}</a></div>
     </div>
   {/if}
     
index f024f4f..0bea245 100644 (file)
@@ -39,7 +39,7 @@
             Your registrations have not yet been submitted!
         </p>
         <p>
-            To complete your registrations, please click on the "Submit {$terms.reg_term_registration_cap} Request" button at the bottom of this page.
+            To complete your registrations, please click on the "{$terms.reg_term_button_checkout_page_submit}" button at the bottom of this page.
         </p>
     </div>
     {/if}
@@ -52,7 +52,7 @@
 <!--        <a href="#cart-summary">See summary of {$terms.reg_term_registration} request and charges below</a>-->
     {if $settings.reg_show_navigation_aids}
         <div class="glm-center" style="border: 1px solid black; padding: 10px; margin: 20px">
-            <span class="glm-reg-warning">NOTE: Your {$terms.reg_term_registration} is not complete until you click the "Submit {$terms.reg_term_registration_cap} Request" button at the bottom of this page.</span> <img src="{$assetUrl}/fingerDownRed.svg" style="height: 2em;">
+            <span class="glm-reg-warning">NOTE: Your {$terms.reg_term_registration} is not complete until you click the "{$terms.reg_term_button_checkout_page_submit}" button at the bottom of this page.</span> <img src="{$assetUrl}/fingerDownRed.svg" style="height: 2em;">
         </div>
     {/if}                
         <div id="glm-reg-checkout-form">
     {if $settings.reg_show_navigation_aids}
                 <div class="glm-reg-warning">Your {$terms.reg_term_registration} is not complete until you click here! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> 
     {/if}
-                <input id="regSubmitButton" type="submit" value="Submit {$terms.reg_term_registration_cap} Request" class="button glm-reg-button">
+                <input id="regSubmitButton" type="submit" value="{$terms.reg_term_button_checkout_page_submit}" class="button glm-reg-button">
             </div>
         </form>
     
index 9d99e42..e1d65ae 100644 (file)
@@ -9,7 +9,7 @@
             <div class="glm-reg-login">
             
                 <h4 class="glm-left">Login</h4>
-                <a id="register" class="button tiny glm-right" href="{$regUrl}?page=register">Create an Account</a>
+                <a id="register" class="button tiny glm-right" href="{$regUrl}?page=register">{$terms.reg_term_button_create_account}</a>
                 
                 <div class="glm-row">
                     <div class="glm-columns glm-large-12">
@@ -43,7 +43,7 @@
                 </div>
                 <div class="glm-row">
                     <div class="glm-columns glm-large--12">
-                        <input class="button" type="submit" class="accountLogin" value="Login">
+                        <input class="button" type="submit" class="accountLogin" value="{$terms.reg_term_button_login}">
                     </div>
                 </div>
                 <!-- <div class="glm&#45;row"> -->
index 9f490b0..2cea7db 100644 (file)
@@ -1,4 +1,4 @@
-{* Even Registration App - Backbone.js *}
+{* Event Registration App - Backbone.js *}
 {* Underscore Templates for the Event Registration App *}
 {* Template for Logged in Account *}
 
         {/literal}
     {/if}
         {literal}
-                    <input class="button glm-reg-button" id="glm-reg-cart-continue" type="submit" value="Continue" />
+                    <input class="button glm-reg-button" id="glm-reg-cart-continue" type="submit" value="{/literal}{$terms.reg_term_button_attendee_page_continue}{literal}" />
                 </div>
             </div>
         </div>
         <b><%= start_datetime.datetime %></b>
     <% } %>
 
-    <button class="glm-add-new-account button">Add New {/literal}{$terms.reg_term_attendee_cap}{literal}</button>
+    <button class="glm-add-new-account button">{/literal}{$terms.reg_term_button_add_attendee}{literal}</button>
     <div class="glm-time-full" style="display:none;">There is no more availability for this time.</div>
 
     <div class="reg-class-accounts">
             </div>
         </div>
     <div>
-        <input class="add-new-registrant button" value="Save {/literal}{$terms.reg_term_attendee_cap}{literal}" type="submit">
+        <input class="add-new-registrant button" value="{/literal}{$terms.reg_term_button_save_attendee}{literal}" type="submit">
         <a class="add-new-registrant-cancel button glm-reg-button">Cancel</a>
     </div>
 </script>