From 914505b0358f965f84e604c945c1e179b8c8be25 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 18 Dec 2017 14:24:30 -0500
Subject: [PATCH] Fixed problem where custom field data was not always storing.
 Fixed storing of picklist data.

---
 classes/customFieldSupport.php       | 5 ++---
 views/admin/ajax/newField.html       | 4 ++--
 views/admin/ajax/newFieldOption.html | 4 ++--
 views/admin/customFields/index.html  | 8 ++++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/classes/customFieldSupport.php b/classes/customFieldSupport.php
index 1495d58..458e491 100644
--- a/classes/customFieldSupport.php
+++ b/classes/customFieldSupport.php
@@ -186,7 +186,6 @@ class GlmCustomFieldSupport extends GlmDataFieldsCustomFields
                     default:
                         break;
 
-
                 }
 
                 // Add data to submitData array
@@ -281,7 +280,7 @@ class GlmCustomFieldSupport extends GlmDataFieldsCustomFields
             // If this is an update of existing data
             if ($formUpdate) {
 
-                $text_data     = ($fType=='text'||$fType=='textarea' ? $field['submitted'] : '');
+                $text_data     = ($fType=='text'||$fType=='textarea'||$fType=='picklist' ? $field['submitted'] : '');
                 $checkbox_data = ($fType=='checkbox' ? $field['submitted'] : false);
                 $integer_data  = ($fType=='integer' ? $field['submitted'] : false);
                 $float_data    = ($fType=='float' ? $field['submitted'] : false);
@@ -315,7 +314,7 @@ class GlmCustomFieldSupport extends GlmDataFieldsCustomFields
                     array(
                         'field_id'      => $field['id'],
                         'record_id'     => $recordId,
-                        'text_data'     => ($fType=='text'||$fType=='textarea' ? $field['submitted'] : ''),
+                        'text_data'     => ($fType=='text'||$fType=='textarea'||$fType=='picklist' ? $field['submitted'] : ''),
                         'checkbox_data' => ($fType=='checkbox' ? $field['submitted'] : false),
                         'integer_data'  => ($fType=='integer' ? $field['submitted'] : false),
                         'float_data'    => ($fType=='float' ? $field['submitted'] : false),
diff --git a/views/admin/ajax/newField.html b/views/admin/ajax/newField.html
index 7f1aaea..0dace59 100644
--- a/views/admin/ajax/newField.html
+++ b/views/admin/ajax/newField.html
@@ -14,7 +14,7 @@
         </tr>
         <tr class="FieldRow_{$fieldData.id}"><td colspan="4">Prompt: {$fieldData.field_prompt}</td></tr>
  {if $fieldData.field_type=='picklist'}
-        <tr>
+        <tr class="FieldRow_{$fieldData.id}">
             <th style="text-align: left; padding-left: 2rem;">Option Value</th>
             <th style="text-align: left;">Option Text</th>
             <th style="text-align: left;">Cost</th>
@@ -22,4 +22,4 @@
             <th>&nbsp;</th>
         </tr>
  {/if}                
-        <tr><td  style="border-bottom: 1px solid black;" colspan="4">&nbsp;</td></tr>
\ No newline at end of file
+        <tr id="EndOfFieldOptions_{$fieldData.id}"><td  style="border-bottom: 1px solid black;" colspan="5">&nbsp;</td></tr>
\ No newline at end of file
diff --git a/views/admin/ajax/newFieldOption.html b/views/admin/ajax/newFieldOption.html
index 031eb1d..371b9da 100644
--- a/views/admin/ajax/newFieldOption.html
+++ b/views/admin/ajax/newFieldOption.html
@@ -1,9 +1,9 @@
 {* A line describing the new picklist option. *}
 
-<tr id="FieldOptionRow_{$fieldData.id}">
+<tr id="FieldOptionRow_{$fieldData.id}" class="FieldRow_{$fieldData.field_id}">">
     <td style="text-align: left; padding-left: 2rem;"">{$fieldData.option_value}</td>
     <td style="text-align: left;">{$fieldData.option_text}</td>
-    <td style="text-align: left;">{$fieldData.option_cost}</td>
+    <td style="text-align: left;">${$fieldData.option_cost}</td>
     <td style="text-align: left;">{$fieldData.option_default.name}</td>
     <td style="text-align: left;">
         <div class="DeleteOptionButton_{$fieldData.fid} button button-secondary glm-button-small" data-fieldOptionId="{$fieldData.id}">Delete</div>
diff --git a/views/admin/customFields/index.html b/views/admin/customFields/index.html
index bf85f70..7f2bad8 100644
--- a/views/admin/customFields/index.html
+++ b/views/admin/customFields/index.html
@@ -135,7 +135,7 @@
         </tr>
         <tr class="FieldRow_{$t.id}"><td colspan="4"">Prompt: {$t.field_prompt}</td></tr>
     {if $t.field_type=='picklist'}
-        <tr>
+        <tr class="FieldRow_{$t.id}">
             <th style="text-align: left; padding-left: 2rem;">Option Value</th>
             <th style="text-align: left;">Option Text</th>
             <th style="text-align: left;">Cost</th>
@@ -144,7 +144,7 @@
         </tr>
       {if $t.options}
         {foreach $t.options as $option}
-        <tr id="FieldOptionRow_{$option.id}">
+        <tr id="FieldOptionRow_{$option.id}" class="FieldRow_{$t.id}">
             <td style="text-align: left; padding-left: 2rem;">{$option.option_value}</td>
             <td style="text-align: left;">{$option.option_text}</td>
             <td style="text-align: left;">{$option.option_cost}</td>
@@ -156,7 +156,7 @@
         {/foreach}
       {/if}
     {/if}
-        <tr id="EndOfFieldOptions_{$t.id}"><td  style="border-bottom: 1px solid black;" colspan="5">&nbsp;</td></tr>
+        <tr id="EndOfFieldOptions_{$t.id}" class="FieldRow_{$t.id}"><td  style="border-bottom: 1px solid black;" colspan="5">&nbsp;</td></tr>
   {/foreach}
 {/if}
     </tbody>
@@ -333,7 +333,7 @@ jQuery(document).ready(function($) {
         var {$fid}_fieldId = $(this).attr('data-fieldId');
         
         $("#{$fid}_NewOptionDialog").dialog("open");
-        $('#{$fid}_NewOptionName').val('');
+        $('#{$fid}_NewOptionValue').val('');
         $('#{$fid}_NewOptionText').val('');
         $('#{$fid}_NewOptionDefault').removeAttr('checked');
         $('#{$fid}_NewOptionCost').val('');
-- 
2.17.1