From b1388f2704b89a0a5359fe657086f095234a2b91 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Mon, 25 Feb 2019 21:07:28 -0500 Subject: [PATCH] adding category and amenity support to the member profile edit flyout --- models/admin/ajax/memberManagement.php | 20 +++++++--- models/admin/member/memberInfo.php | 5 ++- views/admin/manageDashboard/edit.html | 3 +- views/admin/manageDashboard/index.html | 39 +++++++++++++++++++ views/admin/member/memberInfo.html | 27 ++----------- .../admin/member/memberInfo/editCategory.html | 3 +- 6 files changed, 65 insertions(+), 32 deletions(-) diff --git a/models/admin/ajax/memberManagement.php b/models/admin/ajax/memberManagement.php index dd9cc52b..334398c3 100644 --- a/models/admin/ajax/memberManagement.php +++ b/models/admin/ajax/memberManagement.php @@ -86,11 +86,13 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin } $memberID = $_REQUEST['memberID']; $memberInfo = $_REQUEST['memberInfo']; - $support->write_log($_REQUEST); + //$support->write_log($_REQUEST); if( $_REQUEST['option'] == 'manage'){ $data = $this->controller( 'member', 'index', array("memberID" => $memberID), true, true); } - + if( $_REQUEST['option'] == 'activate'){ + $data = $this->controller( 'member', 'index',false, true, true); + } if($_REQUEST['option'] == 'list'){ $where = ' true '; $alphaWhere = ' true '; @@ -108,14 +110,22 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin if($_REQUEST['option'] == 'submit'){ foreach($_REQUEST['form'] as $form=>$field){ - $_REQUEST[$field['name']] = $field['value']; + // $_REQUEST[$field['name']] = $field['value']; + if( strpos($field['name'], "category[") !== false){ + $_REQUEST['category'][$field['name']] = $field['value']; + }elseif( strpos($field['name'], "amenity[") !== false){ + $_REQUEST['amenity'][$field['name']] = $field['value']; + }else{ + $_REQUEST[$field['name']] = $field['value']; + } + } - // $support->write_log($_REQUEST); + unset($_REQUEST['form']); $data = $this->controller( 'member', 'memberInfo', false, true, true); } if($_REQUEST['option'] == 'delete'){ $deleteID = $_REQUEST['deleteID']; - $support->write_log($_REQUEST); + //$support->write_log($_REQUEST); $data = $this->controller( 'member', 'index', false, true, true); } $return = array( diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php index 5a7b66b7..a8fcbbbe 100755 --- a/models/admin/member/memberInfo.php +++ b/models/admin/member/memberInfo.php @@ -317,7 +317,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo // Process submission of a member information record update case 'submit': $support = new glmPluginSupport(); - + // $support->write_log($_REQUEST); // Check for new cities being submitted $this->checkNewCities(); @@ -640,10 +640,11 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo // Instatiate categoryMemberInfo class require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCategoryMemberInfo.php'; $CategoryMemberInfo = new GlmDataCategoryMemberInfo($this->wpdb, $this->config); - + $support = new glmPluginSupport(); // Get any selected categories $selectedCategories = array(); $newCategory = false; + if (isset($_REQUEST['category']) && is_array($_REQUEST['category']) && count($_REQUEST['category']) > 0) { /* diff --git a/views/admin/manageDashboard/edit.html b/views/admin/manageDashboard/edit.html index a6419aea..5de7ade1 100644 --- a/views/admin/manageDashboard/edit.html +++ b/views/admin/manageDashboard/edit.html @@ -208,7 +208,8 @@ {if $settings.memb_info_location} {if $m.bad_lat_lon && !$m.has_no_map_data.value}Bad Map Location{/if} {/if} {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)} Clone  - {if $m.status.name != 'Active'}Activate{/if} + {if $m.status.name != 'Active'} + Activate{/if} {/if} diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html index 24c29777..28edd6da 100644 --- a/views/admin/manageDashboard/index.html +++ b/views/admin/manageDashboard/index.html @@ -275,6 +275,45 @@ "POST" ); }); + + $(document).on("click", ".glm-admin-activate-profile",function(e){ + e.preventDefault(); + editData.option = "activate"; + editData.member = $(this).data("member"); + editData.activateID = $(this).data("memberinfo"); + Glma.manageMember( + editData, + function(complete) {}, + function(success) { + $(".edit-screen").html(success.searchData); + }, + function(error) { + console.log(error); + }, + "POST" + ); + }); + // When submit button is clicked, disable the beforeunload message + $(document).on('click', '.updateMemberProfile',function(e) { + e.preventDefault(); + var form = $("#member-info-form"); + editData.option = "submit"; + editData.form = form.serializeArray(); + console.log(editData.form); + window.Glma.manageMember( + editData, + function(complete) {}, + function(success) { + console.log(success); + }, + function(error) { + console.log(error); + }, + "POST" + ); + // glmSubmitRequired = false; + // return true; + }); $(document).on("click", "#glm-edit-member-status", function(e){ e.preventDefault(); }) diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 869c2c37..a2632daa 100755 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -392,10 +392,10 @@ /* * Category Selection */ - + // Action to select a category $('#categorySelect').change( function() { - + // Get the ID, name, and parent of the category var catValue = $('#categorySelect').val(); var catName = $('#categorySelect').find(':selected').text(); @@ -428,7 +428,7 @@ $('#categorySelect').val(''); }); - + $("#categorySelect").select2(); // Action to de-select a category $('.catDelete').live('click', function() { $(this).parent().remove(); @@ -688,26 +688,7 @@ } - // When submit button is clicked, disable the beforeunload message - $('.updateMemberProfile').on('click', function(e) { - e.preventDefault(); - var form = $("#member-info-form"); - memberInfoData.option = "submit"; - memberInfoData.form = form.serializeArray(); - window.Glma.manageMember( - memberInfoData, - function(complete) {}, - function(success) { - console.log(success); - }, - function(error) { - console.log(error); - }, - "POST" - ); - // glmSubmitRequired = false; - // return true; - }); + diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html index d56a4a74..a227e806 100644 --- a/views/admin/member/memberInfo/editCategory.html +++ b/views/admin/member/memberInfo/editCategory.html @@ -116,7 +116,8 @@ jQuery(document).ready(function($) { // Expand multi-select on hover - // $('#filterCategories').multiselect(); + $("#amenitySelect").select2(); + $('#filterCategories').select2(); $('#exportFilterCategories').multiselect(); }); -- 2.17.1