From 69e5a9a05ce1993619171df83c9aa76b6e1cd383 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Fri, 7 Apr 2017 14:39:43 -0400
Subject: [PATCH] adding the list and detail view array to include slugs to
 make targeting the field names easier in the templates

---
 css/front.css                  |  0
 models/front/fields/detail.php | 14 ++++++++------
 models/front/fields/list.php   | 15 ++++++++++-----
 views/front/fields/detail.html | 14 +++++++++++---
 views/front/fields/list.html   | 19 +++++++++++++++----
 5 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 css/front.css

diff --git a/css/front.css b/css/front.css
new file mode 100644
index 0000000..e69de29
diff --git a/models/front/fields/detail.php b/models/front/fields/detail.php
index 4f1c87d..423f007 100644
--- a/models/front/fields/detail.php
+++ b/models/front/fields/detail.php
@@ -60,37 +60,39 @@ class GlmMembersFront_fields_detail extends GlmDataFieldsCustomFields
             $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);
+            
+            $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;
 
             foreach($field_values as $key=>$value){
                 $field_id       = $value['field_id'];
                 $field_value    = $value['field_data']; 
                 $sql            = "SELECT field_name FROM " . GLM_MEMBERS_FIELDS_PLUGIN_DB_PREFIX . "custom_fields WHERE id = $field_id;";
                 $field_name     = $wpdb->get_results($sql);
+                                
                 $field_name     = $field_name[0]->field_name;
 
                 if( $field_value ){
                      $fields[$field_name] = $field_value;
-                } else if( $field_value === 'Yes'){
-                    $slash_price = true;
-                }
+                } 
             }
         }
-        
         // Compile template data
         $templateData = array(
             'field_values'  => $fields,
-            'slash'
         );
         error_reporting(E_ALL ^ E_NOTICE);
         return array(
             'status'           => $status,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => 'front/fields/list.html',
+            'view'             => 'front/fields/detail.html',
             'data'             => $templateData,
             'settings'         => $settings
         );
diff --git a/models/front/fields/list.php b/models/front/fields/list.php
index d0a39ca..370e14a 100644
--- a/models/front/fields/list.php
+++ b/models/front/fields/list.php
@@ -54,7 +54,8 @@ class GlmMembersFront_fields_list extends GlmDataFieldsCustomFields
         $slash_price    = false;  
 
         global $wpdb;
-        
+        $assets_dir  = get_stylesheet_directory_uri() .'/assets'; 
+
         // get the member id to pass to getList, set the where clause
         if ( isset( $actionData['request']['member'] ) ) {
             $member_id = $actionData['request']['member'] - 0;
@@ -64,18 +65,22 @@ class GlmMembersFront_fields_list extends GlmDataFieldsCustomFields
             
             $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;
 
             foreach($field_values as $key=>$value){
                 $field_id       = $value['field_id'];
                 $field_value    = $value['field_data']; 
+                
                 $sql            = "SELECT field_name FROM " . GLM_MEMBERS_FIELDS_PLUGIN_DB_PREFIX . "custom_fields WHERE id = $field_id;";
                 $field_name     = $wpdb->get_results($sql);
                 $field_name     = $field_name[0]->field_name;
+                $slug           = sanitize_title($field_name);
 
                 if( $field_value ){
-                     $fields[$field_name] = $field_value;
-                } else if( $field_value === 'Yes'){
-                    $slash_price = true;
+                    $fields[$slug] = array('nice' => $field_name,'data' => $field_value, 'type' => $member_type);
                 }
             }
         }
@@ -83,7 +88,7 @@ class GlmMembersFront_fields_list extends GlmDataFieldsCustomFields
         // Compile template data
         $templateData = array(
             'field_values'  => $fields,
-            'slash'
+            'assets_dir'    => $assets_dir
         );
         error_reporting(E_ALL ^ E_NOTICE);
         return array(
diff --git a/views/front/fields/detail.html b/views/front/fields/detail.html
index f406c07..47bf474 100644
--- a/views/front/fields/detail.html
+++ b/views/front/fields/detail.html
@@ -1,8 +1,16 @@
 {foreach $field_values as $key=>$value}
 <div class="glm-row field-container">
-   {if $value !== 'Yes'}
+   {if $value !== 'Yes' && $value !== 'No'}
         <div class="glm-small-6 glm-columns field-name">{$key}</div>
-        <div class="glm-small-6 glm-columns field-value">{$value}</div>
+        <div class="glm-small-6 glm-columns field-value {$key}">{$value}</div>
    {/if}
 </div>
-{/foreach}
\ No newline at end of file
+{/foreach}
+
+<script>
+    jQuery(document).ready(function($){
+        if( '{$field_values.MSRP_sale}' === 'Yes'){
+            $('.MSRP').addClass("slash");
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/views/front/fields/list.html b/views/front/fields/list.html
index a817c93..f9dcc7a 100644
--- a/views/front/fields/list.html
+++ b/views/front/fields/list.html
@@ -1,8 +1,19 @@
 {foreach $field_values as $key=>$value}
 <div class="glm-row field-container">
-   {if $value !== 'Yes'}
-        <div class="glm-small-6 glm-columns field-name">{$key}</div>
-        <div class="glm-small-6 glm-columns field-value">{$value}</div>
-   {/if}
+    <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 $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">
+    </div>
+    {/if}
 </div>
 {/foreach}
+<script>
+    jQuery(document).ready(function($){
+        if( '{$field_values}' === 'Yes'){
+            $('.msrp-value').addClass("slash");
+        }
+
+    });
+</script>
-- 
2.17.1