From 19597de8c915dd1cea5ec59034edafc08a95b8f5 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 28 Dec 2017 16:51:56 -0500
Subject: [PATCH] Fixed checkout page. Now chekcing for billing information
 only. Forced certain fields to required.

---
 classes/data/dataAccount.php            |   4 +-
 views/front/registrations/checkout.html | 108 ++++--------------------
 2 files changed, 18 insertions(+), 94 deletions(-)

diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php
index 93e32f5..4852678 100644
--- a/classes/data/dataAccount.php
+++ b/classes/data/dataAccount.php
@@ -169,7 +169,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
             'fname' => array (
                 'field'     => 'fname',
                 'type'      => 'text',
-                'required'  => true,
+                'required'  => false,
                 'use'       => 'a'
             ),
 
@@ -177,7 +177,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
             'lname' => array (
                 'field'     => 'lname',
                 'type'      => 'text',
-                'required'  => true,
+                'required'  => false,
                 'use'       => 'a'
             ),
 
diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html
index 143906c..72b7c84 100644
--- a/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@ -1,5 +1,5 @@
 {apply_filters('glm_members_registrations_header', 'accountHeader')}
-{debug}
+
 {if true} <!-- if checkout process steps are enabled -->
     <div class="row progress-row">
         <div class="progress-container columns">
@@ -47,24 +47,29 @@
             </div>-->
             <div class="glm-row">
                 <div class="glm-large-6 glm-small-12 glm-columns">                    
-                    {if true}
                     <div class="glm-reg-billing-info">                    
                         
                         <h4>Billing Information</h4>
                         <div class="row">
-                                <div class="columns small-12 text-right glm-reg-required glm-reg-checkout-required">
-                                    * Required Fields
-                                </div>
+                            <div class="columns medium-8 small-12 text-left glm-reg-required">
+                            <h4>Billing Information</h4>
+                            </div>
+                            <div class="columns medium-4 small-12 glm-reg-required" style="line-height: 2.5rem;">
+                                * Required Fields
                             </div>
+                        </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_fname = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_fname} glm-reg-required{/if}">First Name{if $regAccount.fieldRequired.bill_fname} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_fname} glm-reg-fail{/if}"><input type="text" name="bill_fname" value="{$regAccount.fieldData.bill_fname}"{if $regAccount.fieldRequired.bill_fname} required{/if}></div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_lname = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_lname} glm-reg-required{/if}">Last Name{if $regAccount.fieldRequired.bill_lname} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_lname} glm-reg-fail{/if}"><input type="text" name="bill_lname" value="{$regAccount.fieldData.bill_lname}"{if $regAccount.fieldRequired.bill_lname} required{/if}></div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_addr1 = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_addr1} glm-reg-required{/if}">Address{if $regAccount.fieldRequired.bill_addr1} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_addr1} glm-reg-fail{/if}"><input type="text" name="bill_addr1" value="{$regAccount.fieldData.bill_addr1}"{if $regAccount.fieldRequired.bill_addr1} required{/if}></div>
                         </div>
@@ -73,10 +78,12 @@
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_addr2} glm-reg-fail{/if}"><input type="text" name="bill_addr2" value="{$regAccount.fieldData.bill_addr2}"{if $regAccount.fieldRequired.bill_addr2} required{/if}></div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_city = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_city} glm-reg-required{/if}">City{if $regAccount.fieldRequired.bill_city} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_city} glm-reg-fail{/if}"><input type="text" name="bill_city" value="{$regAccount.fieldData.bill_city}"{if $regAccount.fieldRequired.bill_city} required{/if}></div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_state = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_state} glm-reg-required{/if}">State{if $regAccount.fieldRequired.bill_state} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_state} glm-reg-fail{/if}">
                                 <select name="bill_state">
@@ -90,6 +97,7 @@
                             </div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_zip = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_zip} glm-reg-required{/if}">Zip/Postal Code{if $regAccount.fieldRequired.bill_zip} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_zip} glm-reg-fail{/if}"><input type="text" name="bill_zip" value="{$regAccount.fieldData.bill_zip}"{if $regAccount.fieldRequired.bill_zip} required{/if}></div>
                         </div>
@@ -107,6 +115,7 @@
                             </div>
                         </div>
                         <div class="glm-reg-row glm-reg-bill-field">
+                            {$regAccount.fieldRequired.bill_phone = true}
                             <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_phone} glm-reg-required{/if}">Phone{if $regAccount.fieldRequired.bill_phone} *{/if}</div>
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_phone} glm-reg-fail{/if}"><input type="text" name="bill_phone" value="{$regAccount.fieldData.bill_phone}"{if $regAccount.fieldRequired.bill_phone} required{/if}></div>
                         </div>
@@ -115,91 +124,6 @@
                             <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.bill_fax} glm-reg-fail{/if}"><input type="text" name="bill_fax" value="{$regAccount.fieldData.bill_fax}"{if $regAccount.fieldRequired.fax} required{/if}></div>
                         </div>
                     </div>
-                    
-                    {/if}
-                    <div class="glm-reg-account-info">
-                        <h4>Account Information</h4>
-                        <div class="glm-reg-row"><div class="glm-small-12 glm-columns"><input id="glm-reg-account-same" checked type="checkbox" name="account_same" value="1"{if $regAccount.accountSame} checked{/if}>&nbsp;Same as Billing Information</div></div>
-      {if $regAccountId == 0 || true}
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.email} glm-reg-required{/if}">E-Mail Address{if $regAccount.fieldRequired.email} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.email} glm-reg-fail{/if}"><input type="email" name="email" value="{$regAccount.fieldData.email}"{if $regAccount.fieldRequired.email} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.password} glm-reg-required{/if}">Password{if $regAccount.fieldRequired.password} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.password} glm-reg-fail{/if}">
-                                <input type="text" name="password" value="{$regAccount.fieldData.password}"{if $regAccount.fieldRequired.password} required{/if} title="Must be at least 8 characters long and contain at least one number and one puncuation character such as one of these #.-_,$%&!">
-                                <p>A password is required to access your registrations and submissions in the future. A suggested password has been supplied.</p>
-                            </div>
-                        </div>
-      {else}
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap">E-Mail Address</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns">
-                                {$regAccount.fieldData.email}
-                                <input type="hidden" name="email" value="{$regAccount.fieldData.email}"> {* Required to keep E-Mail address from being cleared *}
-                            </div>
-                        </div>
-      {/if}
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.fname} glm-reg-required{/if}">First Name{if $regAccount.fieldRequired.fname} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.fname} glm-reg-fail{/if}"><input type="text" name="fname" value="{$regAccount.fieldData.fname}"{if $regAccount.fieldRequired.fname} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.lname} glm-reg-required{/if}">Last Name{if $regAccount.fieldRequired.lname} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.lname} glm-reg-fail{/if}"><input type="text" name="lname" value="{$regAccount.fieldData.lname}"{if $regAccount.fieldRequired.lname} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.org} glm-reg-required{/if}">Organization{if $regAccount.fieldRequired.org} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.org} glm-reg-fail{/if}"><input type="text" name="org" value="{$regAccount.fieldData.org}"{if $regAccount.fieldRequired.org} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.title} glm-reg-required{/if}">Title{if $regAccount.fieldRequired.title} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.title} glm-reg-fail{/if}"><input type="text" name="title" value="{$regAccount.fieldData.title}"{if $regAccount.fieldRequired.title} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.addr1} glm-reg-required{/if}">Address{if $regAccount.fieldRequired.addr1} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.addr1} glm-reg-fail{/if}"><input type="text" name="addr1" value="{$regAccount.fieldData.addr1}"{if $regAccount.fieldRequired.addr1} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.addr2} glm-reg-required{/if}">&nbsp;{if $regAccount.fieldRequired.addr2} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.addr2} glm-reg-fail{/if}"><input type="text" name="addr2" value="{$regAccount.fieldData.addr2}"{if $regAccount.fieldRequired.addr2} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.city} glm-reg-required{/if}">City{if $regAccount.fieldRequired.city} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.city} glm-reg-fail{/if}"><input type="text" name="city" value="{$regAccount.fieldData.city}"{if $regAccount.fieldRequired.city} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.state} glm-reg-required{/if}">State/Province{if $regAccount.fieldRequired.state} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.state} glm-reg-fail{/if}">
-                                <select name="state">
-                                    <option value=""></option>
-                        {foreach $regAccount.fieldData.state.list as $s}
-                                    <option value="{$s.value}"{if $regAccount.fieldData.state.value == $s.value} selected="selected"{/if}>
-                                        {$s.name}
-                                    </option>
-                        {/foreach}
-                                </select>
-                            </div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.zip} glm-reg-required{/if}">Zip/Postal Code{if $regAccount.fieldRequired.zip} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.zip} glm-reg-fail{/if}"><input type="text" name="zip" value="{$regAccount.fieldData.zip}"{if $regAccount.fieldRequired.zip} required{/if}></div>
-                        </div>
-                        <div class="glm-reg-row glm-reg-account-field glm-hidden">
-                            <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.country} glm-reg-required{/if}">Country{if $regAccount.fieldRequired.country} *{/if}</div>
-                            <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.country} glm-reg-fail{/if}">
-                                <select name="country">
-                                    <option value=""></option>
-                        {foreach $regAccount.fieldData.country.list as $c}
-                                    <option value="{$c.value}"{if $regAccount.fieldData.country.value == $c.value} selected="selected"{/if}>
-                                        {$c.name}
-                                    </option>
-                        {/foreach}
-                                </select>
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div class="glm-small-12 glm-large-6 glm-columns glm-reg-cart-summary">
                          <h4 id="cart-summary">Registration Summary</h4>
@@ -375,7 +299,7 @@
             // Get the value from the selected Payment Method
             var payMethodNumb = $(this).val();
             payMethodSelection(payMethodNumb);
-
+            
         });
         function payMethodSelection(payMethodNumb) {
 
@@ -393,7 +317,7 @@
         $("#checkoutForm").submit(function(e){
 
             // If something else is preventing submission, stop here. Use this with custom fields when there are required fields.
-            if (e.isDefautPrevented()) {
+            if (e.isDefaultPrevented()) {
                 return false;
             }
             
-- 
2.17.1