Fixing package/events for member detail

diff --git a/models/admin/management/index.php b/models/admin/management/index.php
index 1bcbf1d..c802364 100644 (file)
--- a/models/admin/management/index.php
+++ b/models/admin/management/index.php
@@ -122,7 +122,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
         if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') {
             $option = $_REQUEST['option'];
         }
-        
+
         foreach ($this->config['addOns'] as $a) {
             if (isset($a['requiredPages'])) {
                 foreach($a['requiredPages'] as $pageName => &$pageData) {
@@ -134,25 +134,26 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                     //$pageData['name'] = single_post_title(get_post(get_option($pageID)));
                 }
                 $requiredPages[$a['underscored_name']] = $a['requiredPages'];
-                
+
                 //$a['requiredPages'][]
             }
         }
 
         switch($option) {
 
-            // Update the settings and redisplay the form
+            // Update General Settings and redisplay the form
             case 'submit':
-                
+
+                // Required Pages
                 $requiredPagesUpdateError = false;
                 if (isset($_REQUEST[GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_LIST_ID]) ){
                     $membersListIdOption = $requiredPages['glm-member-db']['members_list'][''];
-                    $newMembersListId = $_REQUEST[$membersListIdOption]; 
+                    $newMembersListId = $_REQUEST[$membersListIdOption];
                 }
                 $results = $this->wpdb->get_results( "SELECT ID FROM ".$this->wpdb->posts." WHERE ID = ".$newMembersListId);
                 if (get_option($membersListIdOption) == $newMembersListId) {
                     $requiredPagesUpdateError = false;
-                } else if (is_numeric($newMembersListId)) { 
+                } else if (is_numeric($newMembersListId)) {
                     if ($results) {
                         $requiredPagesUpdateError = false;
                     } else {
@@ -161,17 +162,16 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                 } else {
                     $requiredPagesUpdateError .= "\n Page ID $newMembersListId must be numeric.";
                 }
-                
-              
+
                 // Members Only
                 if (isset($_REQUEST[GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID]) ){
                     $membersOnlyIdOption = GLM_MEMBERS_PLUGIN_OPTION_MEMBERS_ONLY_ID;
-                    $newMembersOnlyId = $_REQUEST[$membersOnlyIdOption]; 
+                    $newMembersOnlyId = $_REQUEST[$membersOnlyIdOption];
                 }
                 $results = $this->wpdb->get_results( "SELECT ID FROM ".$this->wpdb->posts." WHERE ID = ".$newMembersOnlyId);
                 if (get_option($membersOnlyIdOption) == $newMembersOnlyId) {
                     $requiredPagesUpdateError = false;
-                } else if (is_numeric($newMembersOnlyId)) { 
+                } else if (is_numeric($newMembersOnlyId)) {
                     if ($results) {
                         $requiredPagesUpdateError = false;
                     } else {
@@ -180,16 +180,16 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                 } else {
                     $requiredPagesUpdateError .= "\n Page ID $newMembersOnlyId must be numeric.";
                 }
-                
+
               // Events
                 if (isset($_REQUEST[GLM_MEMBERS_PLUGIN_OPTION_EVENT_LIST_ID]) ){
                     $eventListIdOption = GLM_MEMBERS_PLUGIN_OPTION_EVENT_LIST_ID;
-                    $newEventListId = $_REQUEST[$eventListIdOption]; 
+                    $newEventListId = $_REQUEST[$eventListIdOption];
                 }
                 $results = $this->wpdb->get_results( "SELECT ID FROM ".$this->wpdb->posts." WHERE ID = ".$newEventListId);
                 if (get_option($eventListIdOption) == $newEventListId) {
                     $requiredPagesUpdateError = false;
-                } else if (is_numeric($newEventListId)) { 
+                } else if (is_numeric($newEventListId)) {
                     if ($results) {
                         $requiredPagesUpdateError = false;
                     } else {
@@ -202,12 +202,12 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                 // Packaging
                 if (isset($_REQUEST[GLM_MEMBERS_PLUGIN_OPTION_PACKAGING_LIST_ID]) ){
                     $packagingListIdOption = GLM_MEMBERS_PLUGIN_OPTION_PACKAGING_LIST_ID;
-                    $newPackagingListId = $_REQUEST[$packagingListIdOption]; 
+                    $newPackagingListId = $_REQUEST[$packagingListIdOption];
                 }
                 $results = $this->wpdb->get_results( "SELECT ID FROM ".$this->wpdb->posts." WHERE ID = ".$newPackagingListId);
                 if (get_option($packagingListIdOption) == $newPackagingListId) {
                     $requiredPagesUpdateError = false;
-                } else if (is_numeric($newPackagingListId)) { 
+                } else if (is_numeric($newPackagingListId)) {
                     if ($results) {
                         $requiredPagesUpdateError = false;
                     } else {
@@ -216,7 +216,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                 } else {
                     $requiredPagesUpdateError .= "\n Page ID $newPackagingListId must be numeric.";
                 }
-                
+
                 if (!$requiredPagesUpdateError) {
                     update_option($membersListIdOption, $newMembersListId);
                     $requiredPages['members_list']['id'] = $newMembersListId;
@@ -226,7 +226,9 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                     $requiredPages['event_list']['id'] = $newEventListId;
                     update_option($packagingListIdOption, $newPackagingListId);
                     $requiredPages['packaging_list']['id'] = $newPackagingListId;
-                } 
+                }
+
+                // Update all general setttings
                 $generalSettings = $this->updateEntry(1);
                 if ($generalSettings['status']) {
                     $settingsUpdated = true;
@@ -241,7 +243,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
 
                 // Try to get the first (should be only) entry for general settings.
                 $generalSettings = $this->editEntry($id);
-                
+
                 if ($generalSettings === false) {
 
                     if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
@@ -259,7 +261,7 @@ class GlmMembersAdmin_management_index extends GlmDataSettingsGeneral
                     );
 */
                 }
-                
+
                 break;
 
         }

diff --git a/models/front/members/detail.php b/models/front/members/detail.php
index 250ecc4..a3f31f0 100644 (file)
--- a/models/front/members/detail.php
+++ b/models/front/members/detail.php
@@ -267,6 +267,9 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo
 
         }
 
+        // Since the ID we recieved with the member data is the pointer to the member info record, replace it with member ID
+        $memberData['id'] = $memberData['member_pointer'];
+
         // Compile template data
         $templateData = array(
             'haveMember' => $haveMember,

diff --git a/views/admin/management/index.html b/views/admin/management/index.html
index 3bda095..0605566 100644 (file)
--- a/views/admin/management/index.html
+++ b/views/admin/management/index.html
@@ -17,10 +17,10 @@
         </h2>
         
         
-        <!-- Debug Settings -->
-        <table id="glm-table-required" class="glm-admin-table glm-settings-table">
+        <!-- Required Pages -->
+        
+        <table id="glm-table-required-page" class="glm-admin-table glm-settings-table">
             {foreach from=$requiredPages key=addon item=requiredPage}
-            <tr><td colspan="2"><hr></td></tr>
             <tr><td colspan="2"><h2>Plugin: {$addon}</h2></td></tr>
                 {foreach from=$requiredPage key=requiredPageName item=requiredPageData}
                 <tr>
@@ -49,10 +49,12 @@
                     </td>
                 </tr>
                 {/foreach}
-                <hr>
             {/foreach}
         </table>
-        <table id="glm-table-debug" class="glm-admin-table glm-settings-table">
+        
+            <!-- Debug Settings -->
+                   
+        <table id="glm-table-debug" class="glm-admin-table glm-settings-table glm-hidden">
             <tr><td colspan="2"><h2>Debug Settings</h2></td></tr>
             <tr>
                 <th>Admin Debug Information:</th>
@@ -83,7 +85,6 @@
             <!-- Misc Settings -->
             
         <table id="glm-table-misc" class="glm-admin-table glm-settings-table glm-hidden">
-            <tr><td colspan="2"><hr></td></tr>
             <tr><td colspan="2"><h2>Misc. Settings</h2></td></tr>
             <tr>
                 <th {if $genSettings.fieldRequired.google_maps_api_key}class="glm-required"{/if}>Google Maps API Key:</th>

diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index d4169ea..fcb69d5 100644 (file)
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -7,7 +7,7 @@
 {apply_filters('glm-member-db-front-members-detail-pageTop', '', $member.id)}
 
 {if $haveMember}
-
+MEMBER ID = {$member.id}
         <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
     {if $settings.detail_show_map}
         <div id="glm-locationMap-container" class="row">