From ae65fc8e8e3acc42c72a832d5ba7d066f74ccca7 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 18 Nov 2016 11:47:04 -0500 Subject: [PATCH] Setting up the date defaults from the coupon management settings. Adding to the settings from management. Use for the date default range, for End and Expire dates. --- classes/data/dataCoupons.php | 6 ++++-- index.php | 3 ++- models/admin/coupons/list.php | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/classes/data/dataCoupons.php b/classes/data/dataCoupons.php index a470d8e..39c2f4e 100644 --- a/classes/data/dataCoupons.php +++ b/classes/data/dataCoupons.php @@ -173,7 +173,8 @@ class GlmDataCoupons extends GlmDataAbstract 'field' => 'end_date', 'type' => 'date', 'required' => true, - 'use' => 'a' + 'use' => 'a', + 'default' => strtotime('+' . $this->config['settings']['default_date_range']) ), // Date Expire Date @@ -181,7 +182,8 @@ class GlmDataCoupons extends GlmDataAbstract 'field' => 'expire', 'type' => 'date', 'required' => true, - 'use' => 'a' + 'use' => 'a', + 'default' => strtotime('+' . $this->config['settings']['default_date_range']) ), // Reference Type - Insert new record diff --git a/index.php b/index.php index 1be5c74..20ca9e0 100644 --- a/index.php +++ b/index.php @@ -144,9 +144,9 @@ if (is_file(GLM_MEMBERS_COUPONS_PLUGIN_DB_SCRIPTS.'/dbVersions.php')) { // Load Add-On Management Settings data /* None - Need to figure out a smooth way to do this. +*/ $glmMembersCouponsManagementSettings = $wpdb->get_row( "SELECT * FROM ".GLM_MEMBERS_COUPONS_PLUGIN_DB_PREFIX."management WHERE id = 1", ARRAY_A ); unset($glmMembersCouponsManagementSettings['id']); -*/ function glmMembersCouponsRegisterAddOn($addOns) { @@ -158,6 +158,7 @@ function glmMembersCouponsRegisterAddOn($addOns) { 'slug' => GLM_MEMBERS_COUPONS_PLUGIN_SLUG, 'actions' => $GLOBALS['glmMembersCouponsAddOnValidActions'], 'config' => array( + 'settings' => $GLOBALS['glmMembersCouponsManagementSettings'] ), 'shortcodes' => $GLOBALS['glmMembersCouponsShortcodes'], 'shortcodesDescription' => $GLOBALS['glmMembersCouponsShortcodesDescription'] diff --git a/models/admin/coupons/list.php b/models/admin/coupons/list.php index 276dc33..1900c33 100644 --- a/models/admin/coupons/list.php +++ b/models/admin/coupons/list.php @@ -139,9 +139,6 @@ class GlmMembersAdmin_coupons_list extends GlmDataCoupons $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); if ($lockedToMember) { $memberID = $lockedToMember; - $this->fields['admin_name']['required'] = true; - $this->fields['admin_email']['required'] = true; - $this->fields['admin_phone']['required'] = true; // Check for Member Menu Use } elseif (defined('GLM_COUPONS_MEMBER_MENU')) { -- 2.17.1