From d775ae7993be20499b962cf73d17a7a301ff75c3 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Thu, 28 Feb 2019 12:22:33 -0500 Subject: [PATCH] Updates requested by MIGCSA and some fixes Added management flags for showing and requiring Organization and Title attendee fields. Updated front-end registration page to handle Organization and Title field updates. Added Organization and Title attendee fields to Attendee edit in reg event Attendee page. Now shwing "(unlimited)" for certain attendees available fields in admin when maximum is unlimted for registration event. Fixed a bad link and some invalid parameter errors in admin areas. --- classes/data/dataAccount.php | 14 +- classes/data/dataManagement.php | 32 +++ classes/data/dataSettingsTerms.php | 16 ++ index.php | 2 +- js/frontRegApp.js | 47 ++++- models/admin/ajax/regAdmin/attendee.php | 11 +- models/front/registrations/registration.php | 14 +- readme.txt | 8 + ..._V1.0.3.sql => create_database_V1.0.4.sql} | 182 +++++++++++------- setup/databaseScripts/dbVersions.php | 3 +- .../update_database_V1.0.4.sql | 33 ++++ views/admin/ajax/registrantsListExport.html | 4 +- .../admin/ajax/registrantsListExportCsv.html | 4 +- views/admin/management/registrations.html | 18 ++ views/admin/management/regterms.html | 15 ++ .../admin/registrations/accountDashboard.html | 2 +- views/admin/registrations/accountEdit.html | 16 +- .../registrations/accountsDashboard.html | 4 +- views/admin/registrations/eventDashboard.html | 31 ++- .../registrations/eventEditNotification.html | 16 +- .../admin/registrations/eventRegistrants.html | 40 +++- views/admin/registrations/requestEdit.html | 2 +- .../registrations/requestsDashboard.html | 22 +-- views/front/registrations/account.html | 6 +- views/front/registrations/checkout.html | 4 +- views/front/registrations/register.html | 2 +- views/front/registrations/registration.html | 42 ++-- views/front/registrations/summary.html | 2 +- 28 files changed, 439 insertions(+), 153 deletions(-) rename setup/databaseScripts/{create_database_V1.0.3.sql => create_database_V1.0.4.sql} (86%) create mode 100755 setup/databaseScripts/update_database_V1.0.4.sql diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php index 98609f1..ac1da1f 100755 --- a/classes/data/dataAccount.php +++ b/classes/data/dataAccount.php @@ -510,9 +510,10 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract // 'contact_state' => array ( 'field' => 'contact_state', - 'type' => 'text', - 'required' => '', - 'use' => 'a' + 'type' => 'list', + 'list' => $this->config['states'], + 'default' => $this->config['settings']['default_state'], + 'use' => 'a' ), // @@ -526,9 +527,10 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract // 'contact_country' => array ( 'field' => 'contact_country', - 'type' => 'text', - 'required' => false, - 'use' => 'a' + 'type' => 'list', + 'list' => $this->config['countries'], + 'default' => 'US', + 'use' => 'a' ), // diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php index dcf779d..a4968bf 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataManagement.php @@ -350,6 +350,38 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract 'use' => 'a' ), + // Display Attendee Organization field + 'reg_attendee_org' => array ( + 'field' => 'reg_attendee_org', + 'type' => 'checkbox', + 'use' => 'a', + 'default' => 0, + ), + + // Display Attendee Title field + 'reg_attendee_title' => array ( + 'field' => 'reg_attendee_title', + 'type' => 'checkbox', + 'use' => 'a', + 'default' => 0, + ), + + // Attendee Organization field Required + 'reg_attendee_org_req' => array ( + 'field' => 'reg_attendee_org_req', + 'type' => 'checkbox', + 'use' => 'a', + 'default' => 0, + ), + + // Attendee Title field Required + 'reg_attendee_title_req' => array ( + 'field' => 'reg_attendee_title_req', + 'type' => 'checkbox', + 'use' => 'a', + 'default' => 0, + ), + // Always Use Full Billing Info 'reg_full_billing_info' => array ( 'field' => 'reg_full_billing_info', diff --git a/classes/data/dataSettingsTerms.php b/classes/data/dataSettingsTerms.php index 7ef91d6..643d707 100644 --- a/classes/data/dataSettingsTerms.php +++ b/classes/data/dataSettingsTerms.php @@ -612,6 +612,22 @@ class GlmDataRegistrationsSettingsTerms extends GlmDataAbstract 'type' => 'text', 'required' => true, 'use' => 'a' + ), + + // Attendee Organization Field + 'reg_term_account_field_org' => array ( + 'field' => 'reg_term_account_field_org', + 'type' => 'text', + 'required' => true, + 'use' => 'a' + ), + + // Attendee Title Field + 'reg_term_account_field_title' => array ( + 'field' => 'reg_term_account_field_title', + 'type' => 'text', + 'required' => true, + 'use' => 'a' ) ); diff --git a/index.php b/index.php index ab6dd7c..939791a 100755 --- a/index.php +++ b/index.php @@ -42,7 +42,7 @@ if (!defined('ABSPATH')) { * version from this plugin. */ define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_VERSION', '1.3.0'); -define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '1.0.3'); +define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '1.0.4'); // 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.46'); diff --git a/js/frontRegApp.js b/js/frontRegApp.js index a0acab8..089880f 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -1,5 +1,26 @@ // js/models/account.js +// js/models/regRate.js + +// Event Reg model + +app.Models.Front.AttendeeFields = Backbone.Model.extend({ + + // Default regRate values + defaults: { + reg_attendee_org: '', + reg_attendee_title: '', + reg_attendee_org_req: '', + reg_attendee_title_req: '' + }, + + initialize: function(){ + // for setting up classes + } + +}); + + // Event Registrant Model app.Models.Front.Account = Backbone.Model.extend({ @@ -784,8 +805,12 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({ var fname = this.$('.reg_fname').val().trim(); var lname = this.$('.reg_lname').val().trim(); var email = this.$('.reg_email').val().trim(); - var org = this.$('.reg_org').val().trim(); - var title = this.$('.reg_title').val().trim(); + if (attendeeFields.get('reg_attendee_org')) { + var org = this.$('.reg_org').val().trim(); + } + if (attendeeFields.get('reg_attendee_title')) { + var title = this.$('.reg_title').val().trim(); + } var addr1 = this.$('.reg_addr1').val().trim(); var addr2 = this.$('.reg_addr2').val().trim(); var city = this.$('.reg_city').val().trim(); @@ -811,6 +836,10 @@ app.Views.Front.RegRequestRegistrant = Backbone.View.extend({ app.sendAlertMessage( '.edit-attendee-form-message', 'First and Last name required!' ); return; } + if ( (org === '' && attendeeFields.get('reg_attendee_org_req')) || (title === '' && attendeeFields.get('reg_attendee_title_req')) ) { + app.sendAlertMessage( '.edit-attendee-form-message', 'Please provide all required fields!' ); + return; + } // Validate the model // Have to require reg_time if app.timeSpecific is true // Get the form values and update the model. @@ -997,8 +1026,12 @@ app.Views.Front.RegTime = Backbone.View.extend({ var fname = this.$('.add_reg_fname').val().trim(); var lname = this.$('.add_reg_lname').val().trim(); var email = this.$('.add_reg_email').val().trim(); - var org = this.$('.add_reg_org').val().trim(); - var title = this.$('.add_reg_title').val().trim(); + if (attendeeFields.get('reg_attendee_org')) { + var org = this.$('.add_reg_org').val().trim(); + } + if (attendeeFields.get('reg_attendee_title')) { + var title = this.$('.add_reg_title').val().trim(); + } var addr1 = this.$('.add_reg_addr1').val().trim(); var addr2 = this.$('.add_reg_addr2').val().trim(); var city = this.$('.add_reg_city').val().trim(); @@ -1023,6 +1056,12 @@ app.Views.Front.RegTime = Backbone.View.extend({ this.$('#loading-' + this.model.get('id') ).hide(); return; } + if ( (org === '' && attendeeFields.get('reg_attendee_org_req')) || (title === '' && attendeeFields.get('reg_attendee_title_req')) ) { + app.sendAlertMessage( '#add-attendee-form-message', 'Please provide all required fields!' ); + this.$('#loading-' + this.model.get('id') ).hide(); + return; + } + if ( email === '' ) { // var confAnsw = confirm( 'You did not supply and Email address! Are you sure you want to add this registrant?' ); // if ( !confAnsw ) { diff --git a/models/admin/ajax/regAdmin/attendee.php b/models/admin/ajax/regAdmin/attendee.php index f22c737..3108bd2 100755 --- a/models/admin/ajax/regAdmin/attendee.php +++ b/models/admin/ajax/regAdmin/attendee.php @@ -155,17 +155,24 @@ class GlmMembersAdmin_registrations_ajax_attendee extends GlmDataRegistrationsRe ); // If the submitted E-Mail is different than what's stored in the account - if (trim($registrantData['email']) != trim($modelData['email'])) { + if (trim($registrantData['email']) != trim($modelData['email']) || + trim($registrantData['org']) != trim($modelData['org']) || + trim($registrantData['title']) != trim($modelData['title']) + ) { // Update the E-Mail address in the account and reset validated flag $this->wpdb->update( GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . 'account', array( 'email' => $modelData['email'], + 'org' => $modelData['org'], + 'title' => $modelData['title'], 'validated' => false ), array( 'id' => $registrantData['account'] ), array( + '%s', + '%s', '%s', '%d' ), @@ -179,6 +186,8 @@ class GlmMembersAdmin_registrations_ajax_attendee extends GlmDataRegistrationsRe 'email' => $modelData['email'], 'fname' => $modelData['fname'], 'lname' => $modelData['lname'], + 'org' => $modelData['org'], + 'title' => $modelData['title'], 'notAttending' => $notAttending, 'notAvailable' => $notAvailable ); diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php index 75c533d..14fe2d8 100755 --- a/models/front/registrations/registration.php +++ b/models/front/registrations/registration.php @@ -410,9 +410,16 @@ } + // Send Attendee field usage to view + $attendeeFields = array( + 'reg_attendee_org' => $this->config['settings']['reg_attendee_org'], + 'reg_attendee_title' => $this->config['settings']['reg_attendee_title'], + 'reg_attendee_org_req' => $this->config['settings']['reg_attendee_org_req'], + 'reg_attendee_title_req' => $this->config['settings']['reg_attendee_title_req'] + ); + $attendeeFieldsJSON = json_encode($attendeeFields, JSON_NUMERIC_CHECK); - - // echo "
".print_r($registrants,1)."
"; + // echo "
".print_r($registrants,1)."
"; // Compile template data $templateData = array( @@ -440,7 +447,8 @@ 'states_list' => $this->config['states'], 'country_list' => $this->config['countries'], 'pluginAssetsUrl' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL, - 'registrantsList' => $registrantsList + 'registrantsList' => $registrantsList, + 'attendeeFieldsJSON' => $attendeeFieldsJSON ); diff --git a/readme.txt b/readme.txt index 5fedb0e..645ad0c 100755 --- a/readme.txt +++ b/readme.txt @@ -25,6 +25,14 @@ e.g. 1. Activate the plugin through the 'Plugins' menu in WordPress == Changelog == += 1.3.1 = +* Update database to version 1.0.4 +* Added management flags for showing and requiring Organization and Title attendee fields. +* Updated front-end registration page to handle Organization and Title field updates. +* Added Organization and Title attendee fields to Attendee edit in reg event Attendee page. +* Now shwing "(unlimited)" for certain attendees available fields in admin when maximum is unlimted for registration event. +* Fixed a bad link and some invalid parameter errors in admin areas. + = 1.3.0 = * Improvements and minor fixes to selecting event by event code in front-end event list. * Added more fields to evnt list in registration events dashboard. diff --git a/setup/databaseScripts/create_database_V1.0.3.sql b/setup/databaseScripts/create_database_V1.0.4.sql similarity index 86% rename from setup/databaseScripts/create_database_V1.0.3.sql rename to setup/databaseScripts/create_database_V1.0.4.sql index 1b863e6..4f51412 100755 --- a/setup/databaseScripts/create_database_V1.0.3.sql +++ b/setup/databaseScripts/create_database_V1.0.4.sql @@ -1,6 +1,6 @@ -- Gaslight Media Registration Database -- File Created: 01/18/2017 14:40:00 --- Database Version: 1.0.1 +-- Database Version: 1.0.4 -- Database Creation Script -- -- To permit each query below to be executed separately, @@ -97,6 +97,11 @@ CREATE TABLE {prefix}management ( reg_paypal_sandbox_clientid TINYTEXT NULL, -- PayPal Client ID reg_paypal_sandbox_secret TINYTEXT NULL, -- PayPal Secret reg_paypal_test TINYINT NULL, -- PayPal test mode - List - see + -- Attendee Field Settings + reg_attendee_org BOOLEAN NULL, -- Ask for Organization field for all attendees - Added in 1.0.4 + reg_attendee_title BOOLEAN NULL, -- as for Title/Department field for all attendees - Added in 1.0.4 + reg_attendee_org_req BOOLEAN NULL, -- Require attendee Organization field for all attendees - Added in 1.0.4 + reg_attendee_title_req BOOLEAN NULL, -- Require attendee Title/Department field for all attendees - Added in 1.0.4 -- Billing settings reg_full_billing_info BOOLEAN NULL, -- Always request full billing information in checkout page regardless of the following settings reg_bill_info_requested SMALLINT DEFAULT 32767, -- Billing information fields to display on checkout page @@ -186,6 +191,8 @@ CREATE TABLE {prefix}settings_terms ( reg_term_button_apply_comp_code TINYTEXT NULL, reg_term_button_cart_page_continue TINYTEXT NULL, reg_term_button_checkout_page_submit TINYTEXT NULL, + reg_term_account_field_org TINYTEXT NULL, -- Added in 1.0.4 + reg_term_account_field_title TINYTEXT NULL, -- Added in 1.0.4 PRIMARY KEY (id) ); @@ -636,73 +643,114 @@ CREATE TABLE {prefix}reg_request_pay_code ( -- 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, - reg_show_select_by_code + canonical_reg_page, -- canonical_reg_page + reg_org_name, -- reg_org_name + reg_org_short, -- reg_org_short + reg_org_address, -- reg_org_address + reg_org_city, -- reg_org_city + reg_org_state, -- reg_org_state + reg_org_zip, -- reg_org_zip + reg_org_phone, -- reg_org_phone + reg_org_toll_free, -- reg_org_toll_free + reg_org_internal_email, -- reg_org_internal_email + reg_org_from_email, -- reg_org_from_email + reg_payment_methods, -- reg_payment_methods + reg_proc_methods, -- reg_proc_methods + reg_cc_accepts, -- reg_cc_accepts + reg_authorize_net_login, -- reg_authorize_net_login + reg_authorize_net_key, -- reg_authorize_net_key + reg_authorize_net_test, -- reg_authorize_net_test + reg_authorize_net_conf, -- reg_authorize_net_conf + reg_authorize_net_merchant_email, -- reg_authorize_net_merchant_email + reg_authorize_net_merchant_seal, -- reg_authorize_net_merchant_seal + reg_merchant_solutions_acctid, -- reg_merchant_solutions_acctid + reg_merchant_solutions_merchantpin, -- reg_merchant_solutions_merchantpin + reg_merchant_solutions_test, -- reg_merchant_solutions_test + reg_merchant_solutions_conf, -- reg_merchant_solutions_conf + reg_merchant_solutions_merchant_email, -- reg_merchant_solutions_merchant_email + reg_paypal_clientid, -- reg_paypal_clientid + reg_paypal_secret, -- reg_paypal_secret + reg_paypal_sandbox_clientid, -- reg_paypal_sandbox_clientid + reg_paypal_sandbox_secret, -- reg_paypal_sandbox_secret + reg_paypal_test, -- reg_paypal_test + reg_attendee_org_req, -- reg_attendee_org_req + reg_attendee_title_req, -- reg_attendee_title_req + reg_full_billing_info, -- reg_full_billing_info + reg_bill_info_requested, -- reg_bill_info_requested + reg_bill_info_req_no_charge, -- reg_bill_info_req_no_charge + reg_bill_info_req_comp_code, -- reg_bill_info_req_comp_code + reg_bill_info_req_cash, -- reg_bill_info_req_cash + reg_bill_info_req_check, -- reg_bill_info_req_check + reg_bill_info_req_credit_card, -- reg_bill_info_req_credit_card + reg_bill_info_req_merchant_call, -- reg_bill_info_req_merchant_call + reg_request_hold_days, -- reg_request_hold_days + reg_account_hold_days, -- reg_account_hold_days + reg_not_submitted_dialog, -- reg_not_submitted_dialog + reg_medical_info, -- reg_medical_info + reg_show_navigation_aids, -- reg_show_navigation_aids + reg_show_attendees_on_reg_page, -- reg_show_attendees_on_reg_page + reg_show_select_by_code -- reg_show_select_by_code ) 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, - true -- reg_show_select_by_code + 'registrations', -- 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_authorize_net_merchant_seal + '', -- reg_merchant_solutions_acctid + '', -- reg_merchant_solutions_merchantpin + true, -- reg_merchant_solutions_test + true, -- reg_merchant_solutions_conf + '', -- reg_merchant_solutions_merchant_email + '', -- reg_paypal_clientid + '', -- reg_paypal_secret + '', -- reg_paypal_sandbox_clientid + '', -- reg_paypal_sandbox_secret + 3, -- reg_paypal_test + 0, -- reg_attendee_org_req + 0, -- reg_attendee_title_req + true, -- reg_full_billing_info + 32767, -- reg_bill_info_requested + 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 + 10, -- reg_request_hold_days + 15, -- reg_account_hold_days + 0, -- reg_not_submitted_dialog + true, -- reg_medical_info + 0, -- reg_show_navigation_aids + 0, -- reg_show_attendees_on_reg_page + true -- reg_show_select_by_code ); + + + + + + + + + ---- -- Insert into settings_terms table @@ -770,7 +818,9 @@ INSERT INTO {prefix}settings_terms reg_term_button_attendee_page_continue, reg_term_button_apply_comp_code, reg_term_button_cart_page_continue, - reg_term_button_checkout_page_submit + reg_term_button_checkout_page_submit, + reg_term_account_field_org, + reg_term_account_field_title ) VALUES ( @@ -836,7 +886,9 @@ INSERT INTO {prefix}settings_terms 'Continue', -- reg_term_button_attendee_page_continue 'Apply Comp Code', -- reg_term_button_apply_comp_code 'Proceed to Checkout', -- reg_term_button_cart_page_continue - 'Submit Registration Request' -- reg_term_button_checkout_page_submit + 'Submit Registration Request', -- reg_term_button_checkout_page_submit + 'Organization', -- reg_term_account_field_org + 'Title/Department' -- reg_term_account_field_title ); ---- diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index a595f81..97d2acc 100755 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -49,7 +49,8 @@ $glmMembersRegistrationsDbVersions = array( '1.0.0' => array('version' => '1.0.0', 'tables' => 18, 'date' => '06/04/2018'), '1.0.1' => array('version' => '1.0.1', 'tables' => 18, 'date' => '06/12/2018'), '1.0.2' => array('version' => '1.0.2', 'tables' => 18, 'date' => '10/08/2018'), - '1.0.3' => array('version' => '1.0.3', 'tables' => 18, 'date' => '12/11/2018') + '1.0.3' => array('version' => '1.0.3', 'tables' => 18, 'date' => '12/11/2018'), + '1.0.4' => array('version' => '1.0.4', 'tables' => 18, 'date' => '02/25/2019') ); diff --git a/setup/databaseScripts/update_database_V1.0.4.sql b/setup/databaseScripts/update_database_V1.0.4.sql new file mode 100755 index 0000000..0501ff4 --- /dev/null +++ b/setup/databaseScripts/update_database_V1.0.4.sql @@ -0,0 +1,33 @@ +-- Gaslight Media Members Database - Registratiuons Add-On +-- File Updated: 2018-10-08 +-- Database Version: 1.0.4 +-- 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}management ADD COLUMN reg_attendee_org BOOLEAN DEFAULT FALSE; + +---- + +ALTER TABLE {prefix}management ADD COLUMN reg_attendee_title BOOLEAN DEFAULT FALSE; + +---- + +ALTER TABLE {prefix}management ADD COLUMN reg_attendee_org_req BOOLEAN DEFAULT FALSE; + +---- + +ALTER TABLE {prefix}management ADD COLUMN reg_attendee_title_req BOOLEAN DEFAULT FALSE; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_account_field_org TINYTEXT DEFAULT NULL; + +---- + +ALTER TABLE {prefix}settings_terms ADD COLUMN reg_term_account_field_title TINYTEXT DEFAULT NULL; + +---- + +UPDATE {prefix}settings_terms SET reg_term_account_field_org = 'Organization', reg_term_account_field_title = 'Title/Department' where id = 1; diff --git a/views/admin/ajax/registrantsListExport.html b/views/admin/ajax/registrantsListExport.html index 759dc18..28cf2b8 100644 --- a/views/admin/ajax/registrantsListExport.html +++ b/views/admin/ajax/registrantsListExport.html @@ -27,8 +27,8 @@ {if $select.exportId}ID{/if} {if $select.exportRegistrant}{$terms.reg_term_attendee_cap} Name{/if} - {if $select.exportOrg}Org{/if} - {if $select.exportTitle}Title{/if} + {if $select.exportOrg}{$terms.reg_term_account_field_org}{/if} + {if $select.exportTitle}{$terms.reg_term_account_field_title}{/if} {if $select.exportAddr1}Address{/if} {if $select.exportAddr2}Addr Line #2{/if} {if $select.exportCity}City{/if} diff --git a/views/admin/ajax/registrantsListExportCsv.html b/views/admin/ajax/registrantsListExportCsv.html index dc121f0..791b1e8 100644 --- a/views/admin/ajax/registrantsListExportCsv.html +++ b/views/admin/ajax/registrantsListExportCsv.html @@ -1,8 +1,8 @@ {if $haveRegistrants} {if $select.exportId}"ID",{/if} {if $select.exportRegistrant}"{$terms.reg_term_attendee_cap} Name",{/if} -{if $select.exportOrg}"Organization",{/if} -{if $select.exportTitle}"Title/Dept",{/if} +{if $select.exportOrg}"{$terms.reg_term_account_field_org}",{/if} +{if $select.exportTitle}"{$terms.reg_term_account_field_title}",{/if} {if $select.exportAddr1}"Address",{/if} {if $select.exportAddr2}"Addr Line #2",{/if} {if $select.exportCity}"City",{/if} diff --git a/views/admin/management/registrations.html b/views/admin/management/registrations.html index 3e62dd0..3b4ac44 100644 --- a/views/admin/management/registrations.html +++ b/views/admin/management/registrations.html @@ -346,6 +346,24 @@ + + +

Attendee Information Fields

+ + + Attendee Organization Field + + Display
+ Required + + + + Attendee Title/Department Field + + Display
+ Required + +

Billing Information Fields

diff --git a/views/admin/management/regterms.html b/views/admin/management/regterms.html index 34f963b..9c4caf9 100644 --- a/views/admin/management/regterms.html +++ b/views/admin/management/regterms.html @@ -562,6 +562,21 @@ {if $termSettings.fieldFail.reg_term_button_checkout_page_submit}

{$termSettings.fieldFail.reg_term_button_checkout_page_submit}

{/if} +  

Attendee/Account Field Titles

+ + Organization: + + + {if $termSettings.fieldFail.reg_term_account_field_org}

{$termSettings.fieldFail.reg_term_account_field_org}

{/if} + + + + Title/Department: + + + {if $termSettings.fieldFail.reg_term_account_field_title}

{$termSettings.fieldFail.reg_term_account_field_title}

{/if} + + diff --git a/views/admin/registrations/accountDashboard.html b/views/admin/registrations/accountDashboard.html index f990884..d2c4f55 100755 --- a/views/admin/registrations/accountDashboard.html +++ b/views/admin/registrations/accountDashboard.html @@ -104,7 +104,7 @@ {foreach $account.registrants as $registrant} - {$registrant.id} + {$registrant.id} {$registrant.fname} {$registrant.lname} {$registrant.event_name} {$registrant.class_name} diff --git a/views/admin/registrations/accountEdit.html b/views/admin/registrations/accountEdit.html index d794ae0..7cc9d79 100644 --- a/views/admin/registrations/accountEdit.html +++ b/views/admin/registrations/accountEdit.html @@ -104,7 +104,7 @@ - Organization: + {$terms.reg_term_account_field_org}: {if $account.fieldFail.org}

{$account.fieldFail.org}

{/if}
@@ -112,7 +112,7 @@ - Title: + {$terms.reg_term_account_field_title}: {if $account.fieldFail.title}

{$account.fieldFail.title}

{/if}
@@ -216,7 +216,7 @@ - Organization: + {$terms.reg_term_account_field_org}: {if $account.fieldFail.bill_org}

{$account.fieldFail.bill_org}

{/if}
@@ -224,7 +224,7 @@ - Title: + {$terms.reg_term_account_field_title}: {if $account.fieldFail.bill_title}

{$account.fieldFail.bill_title}

{/if}
@@ -343,7 +343,7 @@ - Organization: + {$terms.reg_term_account_field_org}: {if $account.fieldFail.contact_org}

{$account.fieldFail.contact_org}

{/if}
@@ -351,7 +351,7 @@ - Title: + {$terms.reg_term_account_field_title}: {if $account.fieldFail.contact_title}

{$account.fieldFail.contact_title}

{/if}
@@ -386,7 +386,7 @@ State: - + {foreach $account.fieldData.contact_country.list as $c}