From 164a283d7505e4af2eeaff0294f9ce4553b097f3 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 14 Apr 2017 11:03:37 -0400
Subject: [PATCH] Fix issue with member or member info

For the custom field data abstract it needs to link to member info not
member.
---
 classes/data/dataCustomFieldsData.php |  6 +++---
 models/front/fields/detail.php        | 27 ++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/classes/data/dataCustomFieldsData.php b/classes/data/dataCustomFieldsData.php
index 723e0d3..c7a7148 100644
--- a/classes/data/dataCustomFieldsData.php
+++ b/classes/data/dataCustomFieldsData.php
@@ -133,9 +133,9 @@ class GlmDataFieldsCustomFieldsData extends GlmDataAbstract
             'ref_dest' => array (
                 'field' => 'ref_dest',
                 'type' => 'pointer',
-                    'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'members',
-                    'p_field' => 'name',
-                    'p_orderby' => 'name',
+                    'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'member_info',
+                    'p_field' => 'member_name',
+                    'p_orderby' => 'member_name',
                     'p_blank' => true,
                 'use' => 'a'
             ),
diff --git a/models/front/fields/detail.php b/models/front/fields/detail.php
index e89a23d..17b2a2f 100644
--- a/models/front/fields/detail.php
+++ b/models/front/fields/detail.php
@@ -47,7 +47,7 @@ class GlmMembersFront_fields_detail extends GlmDataFieldsCustomFields
 
     public function modelAction( $actionData = false )
     {
-        $member_id      = null;
+        $member_info_id = null;
         $where          = '';
         $order          = '';
         $field_vals     = '';
@@ -57,20 +57,33 @@ class GlmMembersFront_fields_detail 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_info_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);
 
-            $sql            = "SELECT mt.name FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type mt, " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members m WHERE m.id = $member_id AND mt.id = m.member_type";
+            $sql = "
+            SELECT mt.name
+              FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type mt, " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members m,
+                   " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_info mi
+             WHERE mi.member = $member_info_id
+               AND m.id = mi.member
+               AND mt.id = m.member_type";
+/*
+            $sql            = "
+            SELECT mt.name
+              FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type mt, " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members m
+             WHERE m.id = $member_info_id
+               AND mt.id = m.member_type";
             $member_type    = $wpdb->get_var($sql);
+ */
+
+
 
-            
-            
             foreach($field_values as $key=>$value){
                 $field_id       = $value['field_id'];
                 $field_value    = $value['field_data'];
-- 
2.17.1