From 835880aa6992cb7340eeb2c763a386eb8a16bc4e Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 8 Feb 2017 16:20:00 -0500
Subject: [PATCH] L#4

---
 models/admin/management/registrations.php |   4 +-
 models/admin/management/regterms.php      |   2 +-
 views/admin/management/registrations.html | 137 +++++++++++++---------
 3 files changed, 83 insertions(+), 60 deletions(-)

diff --git a/models/admin/management/registrations.php b/models/admin/management/registrations.php
index dd3a7e0..37bd058 100644
--- a/models/admin/management/registrations.php
+++ b/models/admin/management/registrations.php
@@ -140,7 +140,7 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
                 // Update the general settings
                 $reg_settings = $this->updateEntry( 1 );
 
-                echo "<pre>" . print_r($reg_settings, true) . "</pre>";
+                //echo "<pre>" . print_r($reg_settings, true) . "</pre>";
                 
                 // Display admin message that the data has been updated
                 glmMembersAdmin::addNotice('General Settings for the '.GLM_MEMBERS_REGISTRATIONS_PLUGIN_NAME.' plugin have been updated.', 'AdminNotice');
@@ -153,7 +153,7 @@ class GlmMembersAdmin_management_registrations extends GlmDataRegistrationsManag
                 // Try to get the first (should be only) entry for general settings.
                 $reg_settings = $this->editEntry( 1 );
 
-                echo "<pre>" . print_r($reg_settings, true) . "</pre>";
+                //echo "<pre>" . print_r($reg_settings, true) . "</pre>";
                 
                 // Check that we actually have the terms
                 if ($reg_settings === false) {
diff --git a/models/admin/management/regterms.php b/models/admin/management/regterms.php
index b91b22e..6f3304f 100644
--- a/models/admin/management/regterms.php
+++ b/models/admin/management/regterms.php
@@ -142,7 +142,7 @@ class GlmMembersAdmin_management_regterms extends GlmDataRegistrationsSettingsTe
                 if ($termsSettings === false) {
 
                     if (GLM_MEMBERS_PLUGIN_ADMIN_DEBUG) {
-                        glmMembersAdmin::addNotice("<b>/modesl/admin/settings/terms.php:</b> Unable to load Terms Settings.", 'Alert');
+                        glmMembersAdmin::addNotice("<b>/models/admin/settings/terms.php:</b> Unable to load Terms Settings.", 'Alert');
                     }
 
                     return array(
diff --git a/views/admin/management/registrations.html b/views/admin/management/registrations.html
index cb40abd..f89cd53 100644
--- a/views/admin/management/registrations.html
+++ b/views/admin/management/registrations.html
@@ -37,63 +37,73 @@
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Name</th>
-                        <td>
-                            <input type='text' name="reg_org_name" value="{$regSettings.fieldData.reg_org_name}">
+                        <th {if $regSettings.fieldRequired.reg_org_name}class="glm-required"{/if}>Organization Name:</th>
+                        <td {if $regSettings.fieldFail.reg_org_name}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_name" value="{$regSettings.fieldData.reg_org_name}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_name}<p>{$regSettings.fieldFail.reg_org_name}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Short Name</th>
-                        <td>
-                            <input type='text' name="reg_org_short" value="{$regSettings.fieldData.reg_org_short}">
+                        <th {if $regSettings.fieldRequired.reg_org_short}class="glm-required"{/if}>Organization Short Name:</th>
+                        <td {if $regSettings.fieldFail.reg_org_short}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_short" value="{$regSettings.fieldData.reg_org_short}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_short}<p>{$regSettings.fieldFail.reg_org_short}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Address</th>
-                        <td>
-                            <input type='text' name="reg_org_name" value="{$regSettings.fieldData.reg_org_address}">
+                        <th {if $regSettings.fieldRequired.reg_org_address}class="glm-required"{/if}>Organization Address:</th>
+                        <td {if $regSettings.fieldFail.reg_org_address}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_address" value="{$regSettings.fieldData.reg_org_address}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_address}<p>{$regSettings.fieldFail.reg_org_address}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization City</th>
-                        <td>
-                            <input type='text' name="reg_org_city" value="{$regSettings.fieldData.reg_org_city}">
+                        <th {if $regSettings.fieldRequired.reg_org_city}class="glm-required"{/if}>Organization City:</th>
+                        <td {if $regSettings.fieldFail.reg_org_city}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_city" value="{$regSettings.fieldData.reg_org_city}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_city}<p>{$regSettings.fieldFail.reg_org_city}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization State</th>
-                        <td>
-                            <input type='text' name="reg_org_name" value="{$regSettings.fieldData.reg_org_state}">
+                        <th {if $regSettings.fieldRequired.reg_org_state}class="glm-required"{/if}>Organization State:</th>
+                        <td {if $regSettings.fieldFail.reg_org_state}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_state" value="{$regSettings.fieldData.reg_org_state}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_state}<p>{$regSettings.fieldFail.reg_org_state}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Zip/Postal Code</th>
-                        <td>
-                            <input type='text' name="reg_org_zip" value="{$regSettings.fieldData.reg_org_zip}">
+                        <th {if $regSettings.fieldRequired.reg_org_zip}class="glm-required"{/if}>Organization Zip/Postal Code:</th>
+                        <td {if $regSettings.fieldFail.reg_org_zip}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_zip" value="{$regSettings.fieldData.reg_org_zip}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_zip}<p>{$regSettings.fieldFail.reg_org_zip}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Phone</th>
-                        <td>
-                            <input type='text' name="reg_org_phone" value="{$regSettings.fieldData.reg_org_phone}">
+                        <th {if $regSettings.fieldRequired.reg_org_phone}class="glm-required"{/if}>Organization Phone:</th>
+                        <td {if $regSettings.fieldFail.reg_org_phone}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_phone" value="{$regSettings.fieldData.reg_org_phone}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_phone}<p>{$regSettings.fieldFail.reg_org_phone}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Toll Free</th>
-                        <td>
-                            <input type='text' name="reg_org_toll_free" value="{$regSettings.fieldData.reg_org_toll_free}">
+                        <th {if $regSettings.fieldRequired.reg_org_toll_free}class="glm-required"{/if}>Organization Toll Free:</th>
+                        <td {if $regSettings.fieldFail.reg_org_toll_free}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_toll_free" value="{$regSettings.fieldData.reg_org_toll_free}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_toll_free}<p>{$regSettings.fieldFail.reg_org_toll_free}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization Internal E-Mail</th>
-                        <td>
-                            <input type='text' name="reg_org_internal_email" value="{$regSettings.fieldData.reg_org_internal_email}">
+                        <th {if $regSettings.fieldRequired.reg_org_internal_email}class="glm-required"{/if}>Organization Internal E-Mail:</th>
+                        <td {if $regSettings.fieldFail.reg_org_internal_email}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_internal_email" value="{$regSettings.fieldData.reg_org_internal_email}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_internal_email}<p>{$regSettings.fieldFail.reg_org_internal_email}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Organization 'from" E-Mail</th>
-                        <td>
-                            <input type='text' name="reg_org_from_email" value="{$regSettings.fieldData.reg_org_from_email}">
+                        <th {if $regSettings.fieldRequired.reg_org_from_email}class="glm-required"{/if}>Organization 'from" E-Mail:</th>
+                        <td {if $regSettings.fieldFail.reg_org_from_email}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_org_from_email" value="{$regSettings.fieldData.reg_org_from_email}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_org_from_email}<p>{$regSettings.fieldFail.reg_org_from_email}</p>{/if}
                         </td>
                     </tr>
                     <tr>
@@ -124,24 +134,30 @@
                         </td>
                     </tr>
                     <tr>
-                        <th>Authorize.net Login</th>
-                        <td>
-                            <input type='text' name="reg_authorize_net_login" value="{$regSettings.fieldData.reg_authorize_net_login}">
+                        <th {if $regSettings.fieldRequired.reg_authorize_net_login}class="glm-required"{/if}>Authorize.net Login:</th>
+                        <td {if $regSettings.fieldFail.reg_authorize_net_login}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_authorize_net_login" value="{$regSettings.fieldData.reg_authorize_net_login}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_authorize_net_login}<p>{$regSettings.fieldFail.reg_authorize_net_login}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Authorize.net Key</th>
-                        <td>
-                            <input type='text' name="reg_authorize_net_key" value="{$regSettings.fieldData.reg_authorize_net_key}">
+                        <th {if $regSettings.fieldRequired.reg_authorize_net_key}class="glm-required"{/if}>Authorize.net Key:</th>
+                        <td {if $regSettings.fieldFail.reg_authorize_net_key}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_authorize_net_key" value="{$regSettings.fieldData.reg_authorize_net_key}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_authorize_net_key}<p>{$regSettings.fieldFail.reg_authorize_net_key}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th {if $regSettings.fieldRequired.reg_authorize_net_test}class="glm­required"{/if}>Authorize.net Test Mode:</th>
-                        <td {if $regSettings.fieldFail.reg_authorize_net_test}class="glm­form­bad­input" data­tabid="glm-reg-authorize-net-test"{/if}>
-                      {foreach from=$regSettings.fieldData.reg_authorize_net_test.list item=v}
-                            <input type="checkbox" name="reg_authorize_net_test[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
-                      {/foreach}                    
-                            {if $regSettings.fieldFail.reg_authorize_net_test}<p>{$regSettings.fieldFail.reg_authorize_net_test}</p>{/if}
+                        <th>Authorize.net Test Mode:</th>
+                        <td>
+                            <select id="default-state" data-id="reg_authorize_net_test" class="location-address" name="reg_authorize_net_test">
+                                <option value=""></option>
+                                {foreach from=$regSettings.fieldData.reg_authorize_net_test.list item=v}
+                                <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                    {$v.name}
+                                </option>
+                                {/foreach}
+                            </select>
                         </td>
                     </tr>
                     <tr>
@@ -151,30 +167,37 @@
                         </td>
                     </tr>
                     <tr>
-                        <th>Authorize.net Merchant Email</th>
-                        <td>
-                            <input type='text' name="reg_authorize_net_merchant_email" value="{$regSettings.fieldData.reg_authorize_net_merchant_email}">
+                        <th {if $regSettings.fieldRequired.reg_authorize_net_merchant_email}class="glm-required"{/if}>Authorize.net Merchant Email:</th>
+                        <td {if $regSettings.fieldFail.reg_authorize_net_merchant_email}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_authorize_net_merchant_email" value="{$regSettings.fieldData.reg_authorize_net_merchant_email}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_authorize_net_merchant_email}<p>{$regSettings.fieldFail.reg_authorize_net_merchant_email}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Merchant Solutions Account ID</th>
-                        <td>
-                            <input type='text' name="reg_merchant_solutions_acctid" value="{$regSettings.fieldData.reg_merchant_solutions_acctid}">
+                        <th {if $regSettings.fieldRequired.reg_merchant_solutions_acctid}class="glm-required"{/if}>Merchant Solutions Account ID:</th>
+                        <td {if $regSettings.fieldFail.reg_merchant_solutions_acctid}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_merchant_solutions_acctid" value="{$regSettings.fieldData.reg_merchant_solutions_acctid}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_merchant_solutions_acctid}<p>{$regSettings.fieldFail.reg_merchant_solutions_acctid}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th>Merchant Solutions Merchant PIN</th>
-                        <td>
-                            <input type='text' name="reg_merchant_solutions_merchantpin" value="{$regSettings.fieldData.reg_merchant_solutions_merchantpin}">
+                        <th {if $regSettings.fieldRequired.reg_merchant_solutions_merchantpin}class="glm-required"{/if}>Merchant Solutions Merchant PIN:</th>
+                        <td {if $regSettings.fieldFail.reg_merchant_solutions_merchantpin}class="glm-form-bad-input"{/if}>
+                            <input type="text" name="reg_merchant_solutions_merchantpin" value="{$regSettings.fieldData.reg_merchant_solutions_merchantpin}" class="glm-form-text-input-medium">
+                            {if $regSettings.fieldFail.reg_merchant_solutions_merchantpin}<p>{$regSettings.fieldFail.reg_merchant_solutions_merchantpin}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th {if $regSettings.fieldRequired.reg_merchant_solutions_test}class="glm­required"{/if}>Merchant Solutions Test Mode:</th>
-                        <td {if $regSettings.fieldFail.reg_merchant_solutions_test}class="glm­form­bad­input" data­tabid="glm-reg-merchant-solutions-test"{/if}>
-                      {foreach from=$regSettings.fieldData.reg_merchant_solutions_test.list item=v}
-                            <input type="checkbox" name="reg_merchant_solutions_test[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
-                      {/foreach}                    
-                            {if $regSettings.fieldFail.reg_merchant_solutions_test}<p>{$regSettings.fieldFail.reg_merchant_solutions_test}</p>{/if}
+                        <th>Merchant Solutions Test Mode:</th>
+                        <td>
+                            <select id="default-state" data-id="reg_merchant_solutions_test" class="location-address" name="reg_merchant_solutions_test">
+                                <option value=""></option>
+                                {foreach from=$regSettings.fieldData.reg_merchant_solutions_test.list item=v}
+                                <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                    {$v.name}
+                                </option>
+                                {/foreach}
+                            </select>
                         </td>
                     </tr>
                     <tr>
-- 
2.17.1