From 811540e74e39f811f490889aad3f4acbbcfc9d87 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 7 Apr 2017 16:41:20 -0400
Subject: [PATCH] adding member type checking in the list view

---
 models/front/fields/detail.php |  2 +-
 models/front/fields/list.php   | 20 ++++++++++++--------
 views/front/fields/list.html   |  5 +++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/models/front/fields/detail.php b/models/front/fields/detail.php
index 44e7e21..050b711 100644
--- a/models/front/fields/detail.php
+++ b/models/front/fields/detail.php
@@ -62,7 +62,7 @@ class GlmMembersFront_fields_detail extends GlmDataFieldsCustomFields
             $member_info_id = $member_info->getActiveInfoIdForMember($member_id);
  
             $where = "ref_dest = $member_info_id";
-            
+        
             $fields_data    = new GlmDataFieldsCustomFieldsData($this->wpdb, $this->config);
             $field_values   = $fields_data->getList($where);
             
diff --git a/models/front/fields/list.php b/models/front/fields/list.php
index 2e51d4d..bd5b3a9 100644
--- a/models/front/fields/list.php
+++ b/models/front/fields/list.php
@@ -58,17 +58,21 @@ class GlmMembersFront_fields_list extends GlmDataFieldsCustomFields
 
         // get the member id to pass to getList, set the where clause
         if ( isset( $actionData['request']['member'] ) ) {
-            $member_id = $actionData['request']['member'] - 0;
-            $member_info    = new GlmDataMemberInfo($this->wpdb, $this->config);
-            $member_info_id = $member_info->getActiveInfoIdForMember($member_id);
+            $member_id          = $actionData['request']['member'] - 0;
+            $member_info        = new GlmDataMemberInfo($this->wpdb, $this->config);
+            $member_info_id     = $member_info->getActiveInfoIdForMember($member_id);
             $where = "ref_dest = $member_info_id";
             
-            $fields_data    = new GlmDataFieldsCustomFieldsData($this->wpdb, $this->config);
-            $field_values   = $fields_data->getList($where);
+            $fields_data        = new GlmDataFieldsCustomFieldsData($this->wpdb, $this->config);
+            $field_values       = $fields_data->getList($where);
             
-            $sql            = "SELECT name FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type WHERE id = $member_id;"; 
-            $member_type    = $wpdb->get_results($sql);
-            $member_type    = $member_type[0]->name;
+            $sql                = "SELECT member_type FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members WHERE id = $member_id;"; 
+            $member_type_id     = $wpdb->get_results($sql);
+            $member_type_id     = $member_type_id[0]->member_type;
+            
+            $sql                = "SELECT name FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type WHERE id = $member_type_id;"; 
+            $member_type        = $wpdb->get_results($sql);
+            $member_type        = $member_type[0]->name;
 
             foreach( $field_values as $key=>$value ){
                 $field_id       = $value['field_id'];
diff --git a/views/front/fields/list.html b/views/front/fields/list.html
index a813464..b35284c 100644
--- a/views/front/fields/list.html
+++ b/views/front/fields/list.html
@@ -5,8 +5,13 @@
     {else}
         <div class="glm-row field-container">
     {/if}
+        {if $value.type !== 'RV'}
+            <div class="glm-small-12 glm-medium-6 glm-large-2 glm-columns field-name home {$key}-key">{$value.nice}</div>
+            <div class="glm-small-12 glm-medium-6 glm-large-10 glm-columns field-value home {$key}-value">{$value.data}</div>
+        {else}
             <div class="glm-small-12 glm-medium-6 glm-large-2 glm-columns field-name {$key}-key">{$value.nice}</div>
             <div class="glm-small-12 glm-medium-6 glm-large-10 glm-columns field-value {$key}-value">{$value.data}</div>
+        {/if}
             {if $key === 'red-hot-deal' && $value.data === 'Yes'}
             <div class="glm-small-12 glm-columns field-value {$key}-logo-container">
                 <img src="{$assets_dir}/redhotdeals.gif">
-- 
2.17.1