merging changes with my delete member profile addition

diff --git a/models/admin/ajax/memberManagement.php b/models/admin/ajax/memberManagement.php
index fef80d2..27387c7 100644 (file)
--- a/models/admin/ajax/memberManagement.php
+++ b/models/admin/ajax/memberManagement.php
@@ -86,6 +86,7 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
         }
         $memberID = $_REQUEST['memberID'];
         $memberInfo = $_REQUEST['memberInfo'];
+       
         if( $_REQUEST['option'] == 'manage'){
             $data = $this->controller( 'member', 'index', array("memberID" => $memberID), true, true);
         }
@@ -112,6 +113,11 @@ class GlmMembersAdmin_ajax_memberManagement extends glmMembersAdmin
             // $support->write_log($_REQUEST);
             $data  = $this->controller( 'member', 'memberInfo',  false, true, true);
         }
+        if($_REQUEST['option'] == 'delete'){
+            $deleteID = $_REQUEST['deleteID'];
+            $support->write_log($_REQUEST);
+            $data  = $this->controller( 'member', 'index',  false, true, true);
+        }
         $return = array(
             'searchData'    => $data,       // Where our events list will go
         );

diff --git a/models/admin/member/index.php b/models/admin/member/index.php
index 94bba4b..ef8aa3f 100644 (file)
--- a/models/admin/member/index.php
+++ b/models/admin/member/index.php
@@ -15,7 +15,7 @@
 
 // Load Members data abstract
 require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php';
-
+require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/glmPluginSupport.php';
 /*
  * This class performs the work for the default action of the "Members" menu
  * option, which is to display the members dashboard.
@@ -114,7 +114,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
         $haveMemberInfo = false;
         $clickThroughCounts = array('day' => 0, 'week' => 0, 'month' => 0);
         $detailViewCounts = array('day' => 0, 'week' => 0, 'month' => 0);
-
+        
         // Check for required Member Types
         require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMemberTypes.php';
         $MemberTypes = new GlmDataMemberTypes($this->wpdb, $this->config);

diff --git a/views/admin/manageDashboard/index.html b/views/admin/manageDashboard/index.html
index e280da7..bbf5d4a 100644 (file)
--- a/views/admin/manageDashboard/index.html
+++ b/views/admin/manageDashboard/index.html
@@ -2,6 +2,10 @@
 <div id="glm-manage-member-dashboard">
     {include file='admin/manageDashboard/adminSearch/searchHeader.html'}
     <div id="glm-admin-member-list" class="row admin-member-list">
+        {if $paging}
+            {include file='admin/manageDashboard/adminSearch/pagination.html'}
+        {/if}
+    
         <div id="glm-admin-list-columns">
             <span class="member-record-header" id="member-record-image"></span>
             <span class="member-record-header" id="member-record-name">Name</span>
@@ -9,14 +13,23 @@
             <span class="member-record-header" id="member-record-packages">Packages</span>
             <span class="member-record-header" id="member-record-featured">Featured</span>
         </div>
+        
+    
         <div id="member-results-container"></div>
+        {if $paging}
+            {include file='admin/manageDashboard/adminSearch/pagination.html'}
+        {/if}
         <div id="glm-admin-search-overlay">      
             <img class="glm-list-loader" src="{$assetsUrl}/loader.gif" alt="">
         </div>
     </div>
     <div id="edit-screen" class="edit-screen sidenav"></div>
 </div>
-
+<style>
+    #wpfooter{
+        display: none;
+    }
+</style>
 <script>
     
     jQuery(function($){
@@ -100,6 +113,8 @@
                     function(complete) {},
                     function(success) {
                         $(".edit-screen").html(success.searchData);
+                        editData.option     = "";
+                        editData.memberID   = "";
                     },
                     function(error) {
                         console.log(error);
@@ -121,10 +136,7 @@
                 editData,
                 function(complete) {},
                 function(success) {
-                    console.log(success);
-                    
                     $(".edit-screen").html(success.searchData);
-                    
                 },
                 function(error) {
                     console.log(error);
@@ -159,10 +171,7 @@
                 editData,
                 function(complete) {},
                 function(success) {
-                    console.log(success);
-                    
                     $(".edit-screen").html(success.searchData);
-                    
                 },
                 function(error) {
                     console.log(error);
@@ -192,6 +201,28 @@
                 "POST"
             );
         });
+            
+        $(document).on("click", "#deleteMemberInfoButton",function(e){
+            e.preventDefault();
+        });
+
+        $(document).on("click", "#deleteMemberInfoSubmit", function(e){
+            e.preventDefault();
+            editData.option     = "delete";
+            editData.member     = $(this).data("member"); 
+            editData.deleteID   = $(this).data("memberinfo");
+            Glma.manageMember(
+                editData,
+                function(complete) {},
+                function(success) {
+                    //$(".edit-screen").html(success.searchData);
+                },
+                function(error) {
+                    console.log(error);
+                },
+                "POST"
+            );
+        });
     });
 
 </script>

diff --git a/views/admin/manageDashboard/list.html b/views/admin/manageDashboard/list.html
index 45adc23..ef3ac5a 100644 (file)
--- a/views/admin/manageDashboard/list.html
+++ b/views/admin/manageDashboard/list.html
@@ -1,7 +1,4 @@
-    {if $paging}
-        {include file='admin/manageDashboard/adminSearch/pagination.html'}
-    {/if}
-    
+
     {if $haveMembers}
         {foreach $members as $member}
             <div class="member-record" data-id="{$member.id}">
@@ -15,7 +12,3 @@
     {else}
         <div id="no-results">No Members</div>
     {/if}
-
-    {if $paging}
-        {include file='admin/manageDashboard/adminSearch/pagination.html'}
-    {/if}

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index 2f8b830..19a0129 100755 (executable)
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -34,12 +34,12 @@
                 be active.
             </p>
       {else}
-            <center>
+            <div>
                 <p><a id="deleteMemberInfoCancel" class="button button-primary">Cancel</a></p>
-                <p><input id="deleteMemberInfoSubmit" type="submit" value="Delete this {$terms.term_member_cap} Profile Version"></p>
-            </center>
+                <p><input id="deleteMemberInfoSubmit" data-member={$member.id} data-memberInfo="{$memberInfoID}" type="submit" value="Delete this {$terms.term_member_cap} Profile Version"></p>
+            </div>
             <div class="glm-item-container">
-                <p><center><span class="glm-error">WARNING:</span></center></p>
+                <p><div><span class="glm-error">WARNING:</span></div></p>
                 <p>
                     <span class="glm-warning">Clicking the "Delete this {$terms.term_member_cap} Profile Version" button above will
                     delete all of the data and images displayed on this page and any other information in the tabs that may show to the right of the "{$terms.term_member_cap} Profile"
@@ -366,7 +366,7 @@
             });
 
             // Action to de-select an Amenity
-            $('.amenityDelete').live('click', function() {
+            $(document).on('click', '.amenityDelete',function() {
                 $(this).parent().remove();
                 // Also set unload warning
                 glmPageUpdateRequired();
@@ -385,9 +385,9 @@
             $('#deleteMemberInfoCancel').on("click", function() {
                 $("#deleteMemberInfoDialog").dialog("close");
             });
-            $('#deleteMemberInfoSubmit').on("click", function() {
-               window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&deleteID={$memberInfo.fieldData.id}");
-            });
+            // $('#deleteMemberInfoSubmit').on("click", function() {
+            //         window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=index&member={$memberID}&deleteID={$memberInfo.fieldData.id}");
+            // });
     {/if}
             /*
              * Category Selection