From f2fb3297af61cebe4c403358d6d93f73d8d40d47 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Tue, 7 Feb 2017 16:56:34 -0500 Subject: [PATCH] fixing data class fields that were causing sql errors --- classes/data/dataSettingsTerms.php | 2 +- models/admin/management/regterms.php | 6 +- views/admin/management/regterms.html | 171 ++++++++++++++------------- 3 files changed, 90 insertions(+), 89 deletions(-) diff --git a/classes/data/dataSettingsTerms.php b/classes/data/dataSettingsTerms.php index a3fb6d2..af6dc8e 100644 --- a/classes/data/dataSettingsTerms.php +++ b/classes/data/dataSettingsTerms.php @@ -406,7 +406,7 @@ class GlmDataRegistrationsSettingsTerms extends GlmDataAbstract // Term for Payment Codes (plur, cap) 'reg_term_payment_code_plur_cap' => array ( - 'field' => '', + 'field' => 'reg_term_payment_code_plur_cap', 'type' => 'text', 'required' => true, 'use' => 'a' diff --git a/models/admin/management/regterms.php b/models/admin/management/regterms.php index ac10868..b91b22e 100644 --- a/models/admin/management/regterms.php +++ b/models/admin/management/regterms.php @@ -125,10 +125,10 @@ class GlmMembersAdmin_management_regterms extends GlmDataRegistrationsSettingsTe case 'submit': // Update the general settings -// $termsSettings = $this->updateEntry(1); + $termsSettings = $this->updateEntry(1); // Display admin message that the data has been updated - glmMembersAdmin::addNotice('Terms Settings for the '.GLM_MEMBERS_PLUGIN_NAME.' plugin have been updated.', 'AdminNotice'); + glmMembersAdmin::addNotice('Terms Settings for the '.GLM_MEMBERS_REGISTRATIONS_PLUGIN_NAME.' plugin have been updated.', 'AdminNotice'); break; @@ -136,7 +136,7 @@ class GlmMembersAdmin_management_regterms extends GlmDataRegistrationsSettingsTe default: // Try to get the first (should be only) entry for general settings. -// $termsSettings = $this->editEntry($id); + $termsSettings = $this->editEntry(1); // Check that we actually have the terms if ($termsSettings === false) { diff --git a/views/admin/management/regterms.html b/views/admin/management/regterms.html index a7721c9..17c6f1c 100644 --- a/views/admin/management/regterms.html +++ b/views/admin/management/regterms.html @@ -1,6 +1,20 @@ -{include file='admin/management/header.html'} - -

NOTE: Some of these terms have not yet been integrated into the site templates.

+ +

Registrations Terms

@@ -11,145 +25,148 @@

Admin Menu and Tab Names

+ - Members Menu: - - - {if $termSettings.fieldFail.reg_term_registrations_name}

{$termSettings.fieldFail.reg_term_registrations_name}

{/if} - - - - Members Menu Tabs: + Registration: - + - + + + + + - + -
Main Dashboard:Normal: {if $termSettings.fieldFail.reg_term_registration}

{$termSettings.fieldFail.reg_term_registration}

{/if}
Member List:Registrations Name: + + {if $termSettings.fieldFail.reg_term_registrations_name}

{$termSettings.fieldFail.reg_term_registrations_name}

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

{$termSettings.fieldFail.reg_term_registration_cap}

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

{$termSettings.fieldFail.reg_term_registration_plur}

{/if}
- - - - Member Menu: - - - {if $termSettings.fieldFail.reg_term_registration_plur_cap}

{$termSettings.fieldFail.reg_term_registration_plur_cap}

{/if} - - - - Member Menu Tabs: - - - + + + +
Member Dashboard:Plural Capitalized + + {if $termSettings.fieldFail.reg_term_registration_plur_cap}

{$termSettings.fieldFail.reg_term_registration_plur_cap}

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

{$termSettings.fieldFail.reg_term_register}

{/if}
Member Info:Capitalized: {if $termSettings.fieldFail.reg_term_register_cap}

{$termSettings.fieldFail.reg_term_register_cap}

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

{$termSettings.fieldFail.reg_term_registers}

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

{$termSettings.fieldFail.reg_term_registering}

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

{$termSettings.fieldFail.reg_term_registering_cap}

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

{$termSettings.fieldFail.reg_term_registered}

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

{$termSettings.fieldFail.reg_term_registered_cap}

{/if} +
+ - Configure Menu: - - - {if $termSettings.fieldFail.reg_term_registered_cap}

{$termSettings.fieldFail.reg_term_registered_cap}

{/if} - - - - Configure Menu Tabs: + Attendee: - + - + - + - + - + - + - - - - - + - - - - - - + + - - - - - + + + +
Member Types:Normal: {if $termSettings.fieldFail.reg_term_attendee}

{$termSettings.fieldFail.reg_term_attendee}

{/if}
Member Categories:Capitalized: {if $termSettings.fieldFail.reg_term_attendee_cap}

{$termSettings.fieldFail.reg_term_attendee_cap}

{/if}
Accommodation Types:Plural: {if $termSettings.fieldFail.reg_term_attendee_plur}

{$termSettings.fieldFail.reg_term_attendee_plur}

{/if}
Amenities:Plural Capitalized: {if $termSettings.fieldFail.reg_term_attendee_plur_cap}

{$termSettings.fieldFail.reg_term_attendee_plur_cap}

{/if}
Cities:Attending: {if $termSettings.fieldFail.reg_term_attending}

{$termSettings.fieldFail.reg_term_attending}

{/if}
Regions:Attended: {if $termSettings.fieldFail.reg_term_attended}

{$termSettings.fieldFail.reg_term_attended}

{/if} @@ -159,49 +176,42 @@
Settings Menu: - - {if $termSettings.fieldFail.term_admin_menu_settings}

{$termSettings.fieldFail.term_admin_menu_settings}

{/if} -
Settings Menu Tabs:Registered User: - + - + - + + + + +
General Settings:Normal: {if $termSettings.fieldFail.reg_term_registered_user}

{$termSettings.fieldFail.reg_term_registered_user}

{/if}
Terms & Phrases:Capitalized: {if $termSettings.fieldFail.reg_term_registered_user_cap}

{$termSettings.fieldFail.reg_term_registered_user_cap}

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

{$termSettings.fieldFail.reg_term_registered_user_plur}

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

{$termSettings.fieldFail.reg_term_registered_user_plur_cap}

{/if} +
Shortcodes Menu: - - {if $termSettings.fieldFail.reg_term_registered_user_plur_cap}

{$termSettings.fieldFail.reg_term_registered_user_plur_cap}

{/if} -

Terms

ID: @@ -325,13 +335,6 @@ {if $termSettings.fieldFail.reg_term_payment_code_cap}

{$termSettings.fieldFail.reg_term_payment_code_cap}

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

{$termSettings.fieldFail.term_attraction_plur}

{/if} -
Plural: @@ -353,16 +356,8 @@ Contact: - - - - - - +
Capitalized: - - {if $termSettings.fieldFail.reg_term_registration_button}

{$termSettings.fieldFail.reg_term_registration_button}

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

{$termSettings.fieldFail.reg_term_contact_information}

{/if} @@ -371,7 +366,13 @@
Registration Button: + + {if $termSettings.fieldFail.reg_term_registration_button}

{$termSettings.fieldFail.reg_term_registration_button}

{/if} +
-- 2.17.1