From a6ade73d7170873d8504d84ff05d0c4d96ad55e2 Mon Sep 17 00:00:00 2001
From: Steve Sutton <ssutton@gmail.com>
Date: Sun, 29 Oct 2017 19:50:58 -0400
Subject: [PATCH] Updating form for add attendee

Bring in glm-grid.
---
 classes/data/dataRegEvent.php               | 12 +++-
 classes/regCartSupport.php                  |  2 +-
 views/front/registrations/registration.html | 64 ++++++++++-----------
 3 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php
index d33443e..88c9d1a 100644
--- a/classes/data/dataRegEvent.php
+++ b/classes/data/dataRegEvent.php
@@ -363,9 +363,15 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
                 $result_data['contact_email'] = $eventData['contact_email'];
                 $result_data['contact_phone'] = $eventData['contact_phone'];
                 $result_data['url']           = $eventData['url'];
-                $result_data['times']         = $eventData['times'];
-                $result_data['starting_date'] = $eventData['starting_date'];
-                $result_data['ending_date']   = $eventData['ending_date'];
+                if ( isset( $eventData['times'] ) && $eventData['times'] ) {
+                    $result_data['times']         = $eventData['times'];
+                }
+                if ( isset( $eventData['starting_date'] ) && $eventData['starting_date'] ) {
+                    $result_data['starting_date'] = $eventData['starting_date'];
+                }
+                if ( isset( $eventData['ending_date'] ) && $eventData['ending_date'] ) {
+                    $result_data['ending_date']   = $eventData['ending_date'];
+                }
             }
 
         }
diff --git a/classes/regCartSupport.php b/classes/regCartSupport.php
index aeedfff..2391df9 100644
--- a/classes/regCartSupport.php
+++ b/classes/regCartSupport.php
@@ -721,7 +721,7 @@ class GlmRegCartSupport
             }
 
             // If it's a guest account and the request ID is in the current session - allow cart
-            if ($_SESSION['LoginAccount']['id'] == 0 && $_SESSION['glm_reg_cart_id'] == $requestId) {
+            if ( isset( $_SESSION['LoginAccount'] ) && $_SESSION['LoginAccount']['id'] == 0 && $_SESSION['glm_reg_cart_id'] == $requestId) {
                 return true;
             }
 
diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 64cec84..eea0c70 100644
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -69,48 +69,44 @@
     {/literal}{if $regEvent.time_specific.value}
         <div id="eventCalendar" style="width: 90%;"></div>
     {/if}{literal}
-        <div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    {/literal}{$terms.reg_term_contact_information}{literal}
+        <div class="glm-reg-row">
+            <div class="glm-columns glm-large-6">
+                <h4>{/literal}{$terms.reg_term_contact_information}{literal}</h4>
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">First Name</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_fname" value="<%- fname %>"></div>
                 </div>
-            </div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_fname" placeholder="First Name" value="<%- fname %>">
-                </div>
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_lname" placeholder="Last Name" value="<%- lname %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Last Name</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_lname" value="<%- lname %>"></div>
                 </div>
-            </div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_email" placeholder="Email Address" value="<%- email %>">
-                    (Email is optional)
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Email Address</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_email" value="<%- email %>"></div>
                 </div>
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_addr1" placeholder="Address 1" value="<%- addr1 %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Address 1</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_addr1" value="<%- addr1 %>"></div>
                 </div>
-            </div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_addr2" placeholder="Address 2" value="<%- addr2 %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Address 2</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_addr2" value="<%- addr2 %>"></div>
                 </div>
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_city" placeholder="City" value="<%- city %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">City</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_city" value="<%- city %>"></div>
                 </div>
-            </div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_state" placeholder="State" value="<%- state %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">State</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_state" value="<%- state %>"></div>
                 </div>
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_zip" placeholder="Zip/Postal Code" value="<%- zip %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Zip/Postal Code</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_zip" value="<%- zip %>"></div>
                 </div>
-            </div>
-            <div class="glm-reg-row">
-                <div class="glm-columns glm-large-6 glm-small-12">
-                    <input class="add_reg_country" placeholder="Country" value="<%- country %>">
+                <div class="glm-reg-row">
+                    <div class="glm-columns glm-large-4 glm-small-12">Country</div>
+                    <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_country" value="<%- country %>"></div>
                 </div>
                 {/literal}{if $regEvent.time_specific.value}
                     Selected Time: <span id="add_reg-select-time-display"></span>
-- 
2.17.1