From 1aa883fc0e081a6cdf8e76bc9a27bb22882cc588 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 21 Nov 2017 14:05:50 -0500 Subject: [PATCH] Update the management into settings. Adding two new fields for from and message for notifications. --- .../{dataManagement.php => dataSettings.php} | 44 ++++++++++++------- index.php | 6 +-- .../{management => settings}/billing.php | 14 +++--- setup/adminTabs.php | 4 +- .../create_database_V0.0.1.sql | 8 ++-- setup/validActions.php | 2 +- .../{management => settings}/billing.html | 29 +++++++++++- 7 files changed, 75 insertions(+), 32 deletions(-) rename classes/data/{dataManagement.php => dataSettings.php} (84%) rename models/admin/{management => settings}/billing.php (91%) rename views/admin/{management => settings}/billing.html (85%) diff --git a/classes/data/dataManagement.php b/classes/data/dataSettings.php similarity index 84% rename from classes/data/dataManagement.php rename to classes/data/dataSettings.php index 8fa5a42..6063294 100644 --- a/classes/data/dataManagement.php +++ b/classes/data/dataSettings.php @@ -24,7 +24,7 @@ * @release SVN: $Id: dataMembers.php,v 1.0 2011/01/25 19:31:47 cscott * Exp $ */ -class GlmDataBillingManagement extends GlmDataAbstract +class GlmDataBillingSettings extends GlmDataAbstract { /** @@ -107,7 +107,7 @@ class GlmDataBillingManagement extends GlmDataAbstract /* * Table Name */ - $this->table = GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX . 'management'; + $this->table = GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX . 'settings'; /* * Table Data Fields @@ -119,49 +119,63 @@ class GlmDataBillingManagement extends GlmDataAbstract 'field' => 'id', 'type' => 'integer', 'view_only' => true, - 'use' => 'a' + 'use' => 'a', ), // Default Billing Period 'billing_period' => array( 'field' => 'billing_period', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Default Invoice Date 'invoice_date' => array( 'field' => 'invoice_date', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', + ), + + // Notification From Email + 'notification_from' => array( + 'field' => 'notification_from', + 'type' => 'text', + 'use' => 'a', + ), + + // Notification Message + 'notification_message' => array( + 'field' => 'notification_message', + 'type' => 'text', + 'use' => 'a', ), // Logo for Invioce PDF 'company_logo' => array( 'field' => 'company_logo', 'type' => 'image', - 'use' => 'a' + 'use' => 'a', ), // Name 'company_name' => array( 'field' => 'company_name', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Name2 'company_name2' => array( 'field' => 'company_name2', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Address 1 'company_addr1' => array( 'field' => 'company_addr1', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Address 2 @@ -175,7 +189,7 @@ class GlmDataBillingManagement extends GlmDataAbstract 'company_city' => array( 'field' => 'company_city', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // State @@ -185,35 +199,35 @@ class GlmDataBillingManagement extends GlmDataAbstract 'list' => $this->config['states'], 'default' => 'MI', 'force_list' => true, - 'use' => 'a' + 'use' => 'a', ), // Zip 'company_zip' => array( 'field' => 'company_zip', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Phone 'company_phone' => array( 'field' => 'company_phone', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // Email 'company_email' => array( 'field' => 'company_email', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), // URL 'company_url' => array( 'field' => 'company_url', 'type' => 'text', - 'use' => 'a' + 'use' => 'a', ), ); diff --git a/index.php b/index.php index b1ece21..f6d22f2 100644 --- a/index.php +++ b/index.php @@ -145,8 +145,8 @@ if (is_file(GLM_MEMBERS_BILLING_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) { // Load Add-On Management Settings data /* None - Need to figure out a smooth way to do this. */ -$glmMembersBillingManagementSettings = $wpdb->get_row( "SELECT * FROM ".GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX."management WHERE id = 1", ARRAY_A ); -unset($glmMembersBillingManagementSettings['id']); +$glmMembersBillingSettings = $wpdb->get_row( "SELECT * FROM ".GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX."settings WHERE id = 1", ARRAY_A ); +unset($glmMembersBillingSettings['id']); function glmMembersBillingRegisterAddOn($addOns) { @@ -158,7 +158,7 @@ function glmMembersBillingRegisterAddOn($addOns) { 'slug' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, 'actions' => $GLOBALS['glmMembersBillingAddOnValidActions'], 'config' => array( - 'settings' => $GLOBALS['glmMembersBillingManagementSettings'] + 'settings' => $GLOBALS['glmMembersBillingSettings'] ), 'shortcodes' => $GLOBALS['glmMembersBillingShortcodes'], 'shortcodesDescription' => $GLOBALS['glmMembersBillingShortcodesDescription'] diff --git a/models/admin/management/billing.php b/models/admin/settings/billing.php similarity index 91% rename from models/admin/management/billing.php rename to models/admin/settings/billing.php index 4608791..faf3ad8 100644 --- a/models/admin/management/billing.php +++ b/models/admin/settings/billing.php @@ -14,10 +14,10 @@ */ // Load Management Events data abstract -require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php'; +require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataSettings.php'; /** - * GlmMembersAdmin_management_billing + * GlmMembersAdmin_settings_billing * * PHP version 5 * @@ -28,7 +28,7 @@ require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php'; * @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott * Exp $ */ -class GlmMembersAdmin_management_billing extends GlmDataBillingManagement +class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings { /** @@ -107,6 +107,7 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement $settings_update_error = false; $billing_settings = false; $option2 = false; + $enable_members = $this->config['settings']['enable_members']; if (isset($_REQUEST['option'])) { $option = $_REQUEST['option']; @@ -145,7 +146,7 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement // Update the settings and redisplay the form case 'submit': - // Update the billing management settings + // Update the billing settings settings $billing_settings = $this->updateEntry(1); if ($billing_settings['status']) { $settings_updated = true; @@ -172,10 +173,11 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement // Compile template data $template_data = array( + 'enable_members' => $enable_members, 'option' => $option, 'settingsUpdated' => $settings_updated, 'settingsUpdateError' => $settings_update_error, - 'billingSettings' => $billing_settings, + 'billingSettings' => $billing_settings, ); // Return status, suggested view, and data to controller @@ -183,7 +185,7 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement 'status' => true, 'menuItemRedirect' => false, 'modelRedirect' => false, - 'view' => 'admin/management/billing.html', + 'view' => 'admin/settings/billing.html', 'data' => $template_data ); diff --git a/setup/adminTabs.php b/setup/adminTabs.php index 3b0bd62..220d203 100644 --- a/setup/adminTabs.php +++ b/setup/adminTabs.php @@ -33,12 +33,12 @@ * */ if ( current_user_can( 'glm_members_members' ) ) { - add_filter( 'glm-member-db-add-tab-for-management', + add_filter( 'glm-member-db-add-tab-for-settings', function( $addOnTabs ) { $newTabs = array( array( 'text' => 'Billing', - 'menu' => 'management', + 'menu' => 'settings', 'action' => 'billing', ) ); diff --git a/setup/databaseScripts/create_database_V0.0.1.sql b/setup/databaseScripts/create_database_V0.0.1.sql index dca366c..09ae3a9 100644 --- a/setup/databaseScripts/create_database_V0.0.1.sql +++ b/setup/databaseScripts/create_database_V0.0.1.sql @@ -65,7 +65,7 @@ CREATE TABLE {prefix}ref_account ( ---- -- Management Options -CREATE TABLE {prefix}management ( +CREATE TABLE {prefix}settings ( id INT NOT NULL AUTO_INCREMENT, billing_period TINYTEXT NOT NULL, invoice_date DATE NOT NULL, @@ -81,13 +81,15 @@ CREATE TABLE {prefix}management ( company_phone TINYTEXT NULL, company_email TINYTEXT NULL, company_url TINYTEXT NULL, + notification_from TINYTEXT NULL, + notification_message TEXT NULL, PRIMARY KEY (id) ); ---- --- Set default billing management entry -INSERT INTO {prefix}management +-- Set default billing settings entry +INSERT INTO {prefix}settings ( id ) VALUES ( 1 ) diff --git a/setup/validActions.php b/setup/validActions.php index 7f31196..a207c60 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -59,7 +59,7 @@ $glmMembersBillingAddOnValidActions = array( 'adminActions' => array( - 'management' => array( + 'settings' => array( 'billing' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, ), ), diff --git a/views/admin/management/billing.html b/views/admin/settings/billing.html similarity index 85% rename from views/admin/management/billing.html rename to views/admin/settings/billing.html index 7cfc849..67124b4 100644 --- a/views/admin/management/billing.html +++ b/views/admin/settings/billing.html @@ -1,4 +1,4 @@ -{include file='admin/management/header.html'} +{include file='admin/settings/header.html'}

Settings @@ -22,8 +22,10 @@ + + - + + + + + + + + + + + + + + +
Defaults
Billing PeriodDefault Billing Period {if $billingSettings.fieldFail.billing_period}

{$billingSettings.fieldFail.billing_period}

{/if}
@@ -38,6 +40,28 @@
Invoice Settings
Notification From + + {if $billingSettings.fieldFail.notification_from}

{$billingSettings.fieldFail.notification_from}

{/if}
+
Notification Message + + {if $billingSettings.fieldFail.notification_message} +

{$billingSettings.fieldFail.notification_message}

+ {/if}
+
Invoice Settings
Company Logo @@ -156,3 +180,4 @@ }); +{include file='admin/footer.html'} -- 2.17.1