From 85994d5330be05bb4e05c8321930e7f8891ff56e Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 17 Apr 2018 11:54:09 -0400
Subject: [PATCH] Fix for the display of custom fields for textarea, checkboxes

fix the display of textarea and checkboxes
---
 models/front/customFields/formDisplay.php | 28 +++++++++++------------
 views/front/customFields/displayForm.html | 18 +++++++--------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/models/front/customFields/formDisplay.php b/models/front/customFields/formDisplay.php
index 4817e14..17d9ad9 100644
--- a/models/front/customFields/formDisplay.php
+++ b/models/front/customFields/formDisplay.php
@@ -103,12 +103,12 @@ class GlmMembersFront_customFields_formDisplay extends GlmDataFieldsCustomFields
     public function modelAction( $actionData = false )
     {
 
-        $formId     = false;
-        $formFields = false;
-        $haveForm   = false;
-        $view       = 'displayForm.html';
-        $parentFormId   = $actionData['request']['parent-form-id'];
-        $recordId   = false;
+        $formId       = false;
+        $formFields   = false;
+        $haveForm     = false;
+        $view         = 'displayForm.html';
+        $parentFormId = $actionData['request']['parent-form-id'];
+        $recordId     = false;
 
         if (GLM_MEMBERS_PLUGIN_FRONT_DEBUG) {
             trigger_error('Shortcode Called: glm-members-customfields-form-display', E_USER_NOTICE);
@@ -149,17 +149,17 @@ class GlmMembersFront_customFields_formDisplay extends GlmDataFieldsCustomFields
 
         // Compile template data
         $templateData = array(
-            'formId'        => $formId,
-            'formFields'    => $formFields,
-            'haveForm'      => $haveForm,
-            'parentFormId'  => $parentFormId
+            'formId'       => $formId,
+            'formFields'   => $formFields,
+            'haveForm'     => $haveForm,
+            'parentFormId' => $parentFormId
         );
 
         return array(
-            'status'           => true,
-            'modelRedirect'    => false,
-            'view'             => 'front/customFields/'.$view,
-            'data'             => $templateData
+            'status'        => true,
+            'modelRedirect' => false,
+            'view'          => 'front/customFields/'.$view,
+            'data'          => $templateData
         );
     }
 }
diff --git a/views/front/customFields/displayForm.html b/views/front/customFields/displayForm.html
index b9d464d..f03ceb7 100644
--- a/views/front/customFields/displayForm.html
+++ b/views/front/customFields/displayForm.html
@@ -22,14 +22,14 @@
                         <div class="glm-row">
                             <div class="glm-small-12 glm-large-12 glm-columns glm-nowrap{if $field.required.value} glm-required{/if}">{$field.field_prompt}</div>
                             <div class="glm-small-12 glm-large-12 glm-columns{if $field.field_fail} glm-fail{/if}">
-                              <textarea {if $parentFormId}id="glmCustomFormField_{$field.id}"{/if} name="glmCustomFormField_{$field.id}" value="" rows="2" cols="50"{if $field.required.value} required{/if}></textarea>
+                              <textarea {if $parentFormId}id="glmCustomFormField_{$field.id}"{/if} name="glmCustomFormField_{$field.id}" rows="2" cols="50"{if $field.required.value} required{/if}>{$field.text_data}</textarea>
                             </div>
                         </div>
     {/if}
     {if $field.field_type == 'checkbox'}
                         <div class="glm-row">
                             <div class="glm-small-12 glm-large-12 glm-columns glm-nowrap{if $field.required.value} glm-required{/if}">
-                                <input {if $parentFormId}id="glmCustomFormField_{$field.id}"{/if} type="checkbox" name="glmCustomFormField_{$field.id}">&nbsp;&nbsp;{$field.field_prompt} 
+                                <input {if $parentFormId}id="glmCustomFormField_{$field.id}"{/if} type="checkbox" name="glmCustomFormField_{$field.id}"{if $field.checkbox_data} checked{/if}>&nbsp;&nbsp;{$field.field_prompt}
                             </div>
                         </div>
     {/if}
@@ -39,11 +39,11 @@
                             <div class="glm-small-12 glm-large-12 glm-columns glm-nowrap{if $field.required.value} glm-required{/if}">
                                 <select {if $parentFormId}id="glmCustomFormField_{$field.id}"{/if} type="checkbox" name="glmCustomFormField_{$field.id}">
                                     <option value=""></option>
-      {foreach $field.options as $option} 
+      {foreach $field.options as $option}
                                     <option value="{$option.option_value}" {if $option.option_default.value}selected{/if}>
                                         {$option.option_text}{if $option.option_cost>0}&nbsp;&nbsp;&nbsp;&nbsp;${$option.option_cost|number_format:2}{/if}
                                     </option>
-      {/foreach}                              
+      {/foreach}
                                 </select>
                             </div>
                         </div>
@@ -54,25 +54,25 @@
 {if $parentFormId}
     <script type="text/javascript">
         jQuery(function($){
-            
+
             // When the form is submitted
             $('#{$parentFormId}').submit(function(e){
 
                 // If there's any required fields that aren't filled in
                 if ( false
-  {assign var="testSep" value=''}                      
+  {assign var="testSep" value=''}
   {foreach $formFields as $field}
     {if isset($field.required) && $field.required.value && ( $field.field_type == 'text' || $field.field_type == 'text' ) }
                     || $('#glmCustomFormField_{$field.id}').val() == ''
-    {/if}                    
+    {/if}
   {/foreach}
                    ) {
 
                     // Block checkout
                     e.preventDefault();
                     alert('Please check all required input');
-                }         
-                
+                }
+
             });
         });
     </script>
-- 
2.17.1