From 03e17e7e6b3d32aedcde7588d815d5e1360462bd Mon Sep 17 00:00:00 2001 From: Craig Owenby Date: Mon, 17 Apr 2017 19:14:00 -0400 Subject: [PATCH] Added Founding Member field everywhere necessary. (#128) * Adding founding member to display * Debug * Debug * Removed debug text and added fontawesome * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Bugfixing * Added admin edit for founding member * Fixed style issue * Fixing false issues --- .../members-tab/member-edit/admin-members-edit.html | 12 ++++++++++++ .../members-tab/member-table/admin-member-data.php | 8 ++++++-- .../member-table/admin-members-table.html | 1 + mas.php | 3 +++ postable/admin-member-edit.php | 2 ++ 5 files changed, 24 insertions(+), 2 deletions(-) diff --git a/front-end-pages/admin-pages/members-tab/member-edit/admin-members-edit.html b/front-end-pages/admin-pages/members-tab/member-edit/admin-members-edit.html index 3a67e64..c358d24 100644 --- a/front-end-pages/admin-pages/members-tab/member-edit/admin-members-edit.html +++ b/front-end-pages/admin-pages/members-tab/member-edit/admin-members-edit.html @@ -21,6 +21,11 @@ $personalEmail = $user->getEmails()[0]['address']; $dm_email = $user->getPrimaryEmail(); +$founding_bool = boolval($user->getCustomSchemas()['roles']['founding-member']); + +$founding_true_check = $founding_bool ? 'checked="checked"' : ''; +$founding_false_check = !$founding_bool ? 'checked="checked"' : ''; + function isSelected($option, $target) { if ($option == $target) { echo "selected"; @@ -79,6 +84,13 @@

Update Member

> +
+ +
+ value="true" name="founding"> True
+ value="false" name="founding"> False +
+ diff --git a/front-end-pages/admin-pages/members-tab/member-table/admin-member-data.php b/front-end-pages/admin-pages/members-tab/member-table/admin-member-data.php index 03a7289..3a239c1 100644 --- a/front-end-pages/admin-pages/members-tab/member-table/admin-member-data.php +++ b/front-end-pages/admin-pages/members-tab/member-table/admin-member-data.php @@ -36,12 +36,15 @@ date_default_timezone_set('EST'); $creation_string = date("m-d-Y", $creation_time); + $founding_bool = boolval($user->getCustomSchemas()['roles']['founding-member']); + $founding_member = $founding_bool ? + '' : ''; + $pass_filter = (!isset($_GET["before"]) || $creation_time <= strtotime($_GET["before"])) && (!isset($_GET["since"]) || $creation_time >= strtotime($_GET["since"])) && - // TODO Add founding member check - (!isset($_GET["founding"]) || true) && + (!isset($_GET["founding"]) || (strtolower($_GET["founding"]) == ($founding_bool ? "true" : "false"))) && (!isset($_GET["type"]) || $_GET["type"] == $type) && (!isset($_GET["status"]) || $_GET["status"] == $status); @@ -56,6 +59,7 @@ $type $status $creation_string + $founding_member END; } diff --git a/front-end-pages/admin-pages/members-tab/member-table/admin-members-table.html b/front-end-pages/admin-pages/members-tab/member-table/admin-members-table.html index 1048c12..a7ecf4f 100644 --- a/front-end-pages/admin-pages/members-tab/member-table/admin-members-table.html +++ b/front-end-pages/admin-pages/members-tab/member-table/admin-members-table.html @@ -23,6 +23,7 @@ Membership Plan Subscription Status Member Since + Founding Member diff --git a/mas.php b/mas.php index 0b05fe6..a9bf0e6 100644 --- a/mas.php +++ b/mas.php @@ -121,6 +121,9 @@ function mas_admin_enqueue_styles($hook) { return; } + // FontAwesome + wp_enqueue_style( 'fontawesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'); + // Bootstrap wp_enqueue_style( 'bootstrap', '//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css'); diff --git a/postable/admin-member-edit.php b/postable/admin-member-edit.php index ff9d341..300ba60 100644 --- a/postable/admin-member-edit.php +++ b/postable/admin-member-edit.php @@ -17,6 +17,7 @@ function prefix_admin_update_member() { $rfidNumber = $_POST['rfidNumber']; $subscriptionType = $_POST['membershipPlan']; $subscriptionExpiry = $_POST['subscriptionExp']; + $founding_member = $_POST['founding']; if ($subscriptionType === 'none') { $subscriptionType = ''; @@ -31,6 +32,7 @@ function prefix_admin_update_member() { $properties['customSchemas']['Subscription_Management']['Subscription_Type'] = $subscriptionType; $properties['customSchemas']['roles']['rfid-id'] = $rfidNumber; + $properties['customSchemas']['roles']['founding-member'] = $founding_member == "true"; if (!empty($subscriptionExpiry)) { $properties['customSchemas']['Subscription_Management']['Subscription_Expiration'] = $subscriptionExpiry; }