Completed initial layout of checkout page.
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 26 Oct 2017 16:13:29 +0000 (12:13 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 26 Oct 2017 16:13:29 +0000 (12:13 -0400)
Implemented GLM grid approach for checkout page and added custom CSS to the top of front.css to accommodate that.
Added hand pointing down icons for use on checkout page.
Updated dataAccount.php and dataRegRequest.php to add proper state and country field specications.
Added more checkout processing and support for that to checkout.php and regCartSupport class.

21 files changed:
assets/finberUpBlack.png [deleted file]
assets/fingerDownBlack.png [new file with mode: 0644]
assets/fingerDownBlack.svg [new file with mode: 0644]
assets/fingerDownRed.png [new file with mode: 0644]
assets/fingerDownRed.svg [new file with mode: 0644]
assets/fingerUpBlack.png [new file with mode: 0644]
classes/data/dataAccount.php
classes/regCartSupport.php
css/front.css
models/admin/ajax/regFront/registrant.php
models/admin/ajax/regFront/request.php
models/front/registrations/cartLinkWidget.php
models/front/registrations/checkout.php
models/front/registrations/checkoutProcess.php
models/front/registrations/index.php
models/front/registrations/list.php
setup/frontHooks.php
views/admin/registrations/accountEdit.html
views/front/registrations/cartLinkWidget.html
views/front/registrations/checkout.html
views/front/registrations/header.html

diff --git a/assets/finberUpBlack.png b/assets/finberUpBlack.png
deleted file mode 100644 (file)
index ecb5cd1..0000000
Binary files a/assets/finberUpBlack.png and /dev/null differ
diff --git a/assets/fingerDownBlack.png b/assets/fingerDownBlack.png
new file mode 100644 (file)
index 0000000..df7fc3a
Binary files /dev/null and b/assets/fingerDownBlack.png differ
diff --git a/assets/fingerDownBlack.svg b/assets/fingerDownBlack.svg
new file mode 100644 (file)
index 0000000..ff23132
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve"><path d="M78.083,55.58c-3.438,0-6.225-2.786-6.225-6.225v-3.267h-0.001v10.999c0,3.438-2.786,6.225-6.225,6.225  c-3.438,0-6.225-2.787-6.225-6.225v7.731c0,3.438-2.787,6.225-6.225,6.225c-3.438,0-6.226-2.787-6.226-6.225v23.956  c0,3.438-2.787,6.225-6.225,6.225s-6.225-2.787-6.225-6.225V49.43c-9.883,10.748-18.816,7.154-18.816,3.244l12.814-37.221  C32.922,3.51,32.72,5.181,37.261,5h39.315c4.269,0,7.731,3.461,7.731,7.731v11.306v14.32v10.998  C84.308,52.794,81.52,55.58,78.083,55.58z"></path></svg>
\ No newline at end of file
diff --git a/assets/fingerDownRed.png b/assets/fingerDownRed.png
new file mode 100644 (file)
index 0000000..305ac6d
Binary files /dev/null and b/assets/fingerDownRed.png differ
diff --git a/assets/fingerDownRed.svg b/assets/fingerDownRed.svg
new file mode 100644 (file)
index 0000000..f54e110
--- /dev/null
@@ -0,0 +1 @@
+<svg fill="#EC5D57" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve"><path d="M78.083,55.58c-3.438,0-6.225-2.786-6.225-6.225v-3.267h-0.001v10.999c0,3.438-2.786,6.225-6.225,6.225  c-3.438,0-6.225-2.787-6.225-6.225v7.731c0,3.438-2.787,6.225-6.225,6.225c-3.438,0-6.226-2.787-6.226-6.225v23.956  c0,3.438-2.787,6.225-6.225,6.225s-6.225-2.787-6.225-6.225V49.43c-9.883,10.748-18.816,7.154-18.816,3.244l12.814-37.221  C32.922,3.51,32.72,5.181,37.261,5h39.315c4.269,0,7.731,3.461,7.731,7.731v11.306v14.32v10.998  C84.308,52.794,81.52,55.58,78.083,55.58z"></path></svg>
\ No newline at end of file
diff --git a/assets/fingerUpBlack.png b/assets/fingerUpBlack.png
new file mode 100644 (file)
index 0000000..ecb5cd1
Binary files /dev/null and b/assets/fingerUpBlack.png differ
index 3ed0ac6..40d3d4c 100644 (file)
@@ -123,7 +123,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'use'       => 'a',
                 'default'   => 1
             ),
-            
+
             // Validated E-Mail address flag
             'validated' => array (
                 'field'     => 'validated',
@@ -131,17 +131,17 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'use'       => 'lg',
                 'default'   => false
             ),
-            
+
             // Validation Code - Used to confirm the person creating an account
             // During validation process this includes the following.  {validation_code}-{timestamp} - validation code is 6 digit number
-            // The validation code is sent in a simple E-Mail to the user who then has to provide that in a certain amount of time 
+            // The validation code is sent in a simple E-Mail to the user who then has to provide that in a certain amount of time
             // The timestamp is to determine if the time for validation has expired.
             'validation_code' => array (
                 'field'     => 'validation_code',
                 'type'      => 'text',
                 'use'       => 'lg'
             ),
-            
+
             // Account
             /*
             'registered_by'    => array (
@@ -223,10 +223,11 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
 
             // State
             'state' => array (
-                'field'     => 'state',
-                'type'      => 'text',
-                'required'  => false,
-                'use'       => 'a'
+                'field' => 'state',
+                'type' => 'list',
+                'list' => $this->config['states'],
+                'default'  => $this->config['settings']['default_state'],
+                'use' => 'a'
             ),
 
             //
@@ -237,12 +238,13 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract
                 'use'       => 'a'
             ),
 
-            //
+            // Country
             'country' => array (
-                'field'     => 'country',
-                'type'      => 'text',
-                'required'  => false,
-                'use'       => 'a'
+                'field' => 'country',
+                'type' => 'list',
+                'list' => $this->config['countries'],
+                'default' => 'US',
+                'use' => 'a'
             ),
 
             //
index 70dd763..aeedfff 100644 (file)
@@ -107,12 +107,16 @@ class GlmRegCartSupport
                 'account'           => $account,
                 'validated'         => false,
                 'status'            => $this->config['submission_status_numb']['CART'],
-                'user_trace_info'   => $_SERVER["REMOTE_ADDR"]." - ".date("m/d/Y H:i:s")
+                'user_trace_info'   => $_SERVER["REMOTE_ADDR"]." - ".date("m/d/Y H:i:s"),
+                'date_created'      => date("Y-m-d H:i:s"),
+                'last_update'       => date("Y-m-d H:i:s")
             ),
             array(
                 '%d',
                 '%d',
                 '%d',
+                '%s',
+                '%s',
                 '%s'
             )
             );
@@ -775,7 +779,8 @@ class GlmRegCartSupport
     }
 
     /*
-     * Remove an event record from the cart
+     * Remove an e        // If there's a
+vent record from the cart
      *
      *
      * @param integer $id ID of this reg_request_event record
@@ -974,15 +979,18 @@ class GlmRegCartSupport
            $requestId = $_SESSION['glm_reg_cart_id'];
 
         }
+        $requestId = ($requestId - 0);
+
+        $cartSummary = array('id' => false);
 
         // If we don't have a request ID
-        if (!$requestId) {
-           return false;
-        }
+        if ($requestId > 0) {
 
-        // Try to get the base cart info
-        $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config);
-        $cartSummary = $RegRequest->getRegRequestSimplified($requestId, true);
+            // Try to get the base cart info
+            $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config);
+            $cartSummary = $RegRequest->getRegRequestSimplified($requestId, true);
+
+        }
 
         $cartSummary['regRequests'] = false;
         $cartSummary['haveOtherRequests'] = false;
@@ -998,7 +1006,6 @@ class GlmRegCartSupport
                 // Build where clause to get any other pending carts for this logged in registrations user
                 $where = "
                         T.account   = $accountId
-                    AND T.id       != $requestId
                     AND T.status    = ".$this->config['submission_status_numb']['CART']."
                 ";
 
@@ -1006,13 +1013,16 @@ class GlmRegCartSupport
                 $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config);
                 $cartSummary['regRequests'] = $RegRequest->getRegRequestListSimplified($where);
 
-                if ($cartSummary['regRequests'] && count($cartSummary['regRequests'])) {
+                if (is_array($cartSummary['regRequests']) && count($cartSummary['regRequests'])) {
                     $cartSummary['haveOtherRequests'] = true;
+
                 }
             }
 
         }
 
+
+        // echo "<pre>".print_r($cartSummary,1)."</pre>";
         return $cartSummary;
 
     }
index 2d5197c..ee8458d 100644 (file)
@@ -1,4 +1,25 @@
 /* Event Registration Edit Page */
+
+/* Temp replacement for glm-row without max-width and other checkout form tampering */
+.glm-reg-row {
+    clear: both;
+    margin-left: auto;
+    margin-right: auto;
+    width: 100%;
+    min-height: 3rem;
+}
+.glm-reg-nowrap {
+    white-space: nowrap;
+}
+.glm-reg-required {
+    color: red;
+}
+.glm-reg-fail input {
+    border: 4px #FFaBa9 solid;
+}
+/* end of tampering */
+
+
 .glm-reg-event-list {
     width: 100%;
     padding: 0;
@@ -278,13 +299,3 @@ span.glm-error {
     color: red;
 }
 
-/* Checkout Form */
-.glm-reg-checkout .glm-form-input {
-    width: 46%;
-    margin-right: 1rem;
-    float: left;
-}
-.glm-reg-checkout div {
-    width: 100%;
-    float: none;
-}
index 459d6b7..469af88 100644 (file)
@@ -135,7 +135,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
 
     }
 
-
     /**
      * addUpdateRegistrantToCart
      *
@@ -166,14 +165,12 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             $data = array(
                 'reg_request'    => $modelData['reg_request'],
                 'reg_event'      => $modelData['reg_event'],
-                'event_name'     => $modelData['event_name'],
-                // 'event_datetime' => $modelData['event_datetime'],
+                'event_name'     => $modelData['event_name']
             );
             $dataFormat = array(
                 '%d', // reg_request
                 '%d', // reg_event
-                '%s', // event_name
-                // '%s', // event_datetime
+                '%s' // event_name
             );
             if ( !$regRequestEventId ) {
                 $this->wpdb->insert(
@@ -217,7 +214,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             );
             $data = array(
                 'reg_event'         => $modelData['reg_event'],
-                // 'event_datetime'    => $modelData['event_datetime'],
                 'reg_request'       => $modelData['reg_request'],
                 'reg_request_event' => $regRequestEventId,
                 'class'             => $modelData['reg_class'],
@@ -225,7 +221,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             );
             $dataFormat = array(
                 '%d', // reg_event
-                // '%s', // event_datetime
                 '%d', // reg_request
                 '%d', // reg_request_event
                 '%d', // class
@@ -273,7 +268,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             );
             $data = array(
                 'reg_event'          => $modelData['reg_event'],
-                // 'event_datetime'     => $modelData['event_datetime'],
                 'reg_request'        => $modelData['reg_request'],
                 'reg_request_event'  => $regRequestEventId,
                 'reg_request_class'  => $regRequestClassId,
@@ -285,7 +279,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             ) ;
             $dataFormat = array(
                 '%d', // reg_event
-                // '%s', // event_datetime
                 '%d', // reg_request
                 '%d', // reg_request_event
                 '%d', // reg_request_class
index 85c2998..80f8530 100644 (file)
@@ -81,8 +81,6 @@ class GlmMembersAdmin_registrations_ajax_request extends GlmDataRegistrationsReg
     public function modelAction($modelData)
     {
 
-trigger_error(print_r($modelData,1));
-
         // Perform specified action
         switch ($modelData['option']) {
 
index aef9c53..5df246a 100644 (file)
@@ -83,7 +83,7 @@ class GlmMembersFront_registrations_cartLinkWidget
 
         $cartData = apply_filters('glm_members_registrations_cart_summary_data', false, false);
 
-        if (is_array($cartData) && $cartData['status']) {
+        if (is_array($cartData) && $cartData['id']) {
             $haveCart = true;
         }
 
index 6106b1d..6ea6efc 100644 (file)
@@ -53,6 +53,8 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport
         $haveCart = false;
         $option = false;
 
+        $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config);
+
         // Get any provided option
         if (isset($_REQUEST['option'])) {
             $option = $_REQUEST['option'];
@@ -62,10 +64,10 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport
         if (isset($_REQUEST['account'])) {
 
             // Make sure it's numeric
-            $this->accountID = ($_REQUEST['account'] - 0);
+            $this->accountId = ($_REQUEST['account'] - 0);
 
-            if ($this->accountID <= 0) {
-                $this->accountID = false;
+            if ($this->accountId <= 0) {
+                $this->accountId = false;
             }
         }
 
@@ -108,12 +110,23 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport
 
         }
 
-        $view = 'checkout';
+        // If this is not a guest submission - Break out the submitting account
+        $regAccountId = $this->cart['request']['account'];
+        if ($regAccountId) {
+            $regAccount = $Account->editEntry($regAccountId);
+// If no account data....
+        }
 
+        // Accounts list not needed
+        unset($this->cart['accounts']);
+
+        $view = 'checkout';
 
         // Compile template data
         $templateData = array(
             'page'          => 'checkout',
+            'regAccountId'  => $this->cart['request']['account'],
+            'regAccount'    => $regAccount,
             'cartId'        => $cartId,
             'haveCart'      => $haveCart,
             'cart'          => $this->cart,
@@ -121,7 +134,10 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport
             'loggedIn'      => ( isset( $_SESSION['LoginAccount'] ) ) ? $_SESSION['LoginAccount']: false,
             'assetUrl'      => GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL
         );
-             // Return status, any suggested view, and any data to controller
+
+        // echo "<pre>".print_r($templateData,1)."</pre>";
+
+        // Return status, any suggested view, and any data to controller
         return array(
             'status'        => true,
             'modelRedirect' => false,
index 2e4905f..96a6c75 100644 (file)
@@ -16,7 +16,7 @@
 // Load Registrations Front-End Support class
 require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/regCartSupport.php';
 
-class GlmMembersAdmin_registrations_event extends GlmRegCartSupport
+class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
 {
 
     /**
@@ -86,11 +86,71 @@ class GlmMembersAdmin_registrations_event extends GlmRegCartSupport
     public function modelAction($actionData = false)
     {
 
+        $requestId = false;
+        $haveRequest = false;
+        $accountId = false;
+        $view = 'checkout';
+        $regAccount = false;
+
+        // Try to get the cart and see if it's valid for checkout
+        if (isset($_SESSION['glm_reg_cart_id'])) {
+
+            $requestId = ($_SESSION['glm_reg_cart_id'] - 0);
+            if ($requestId > 0) {
+
+                // Try to get a validated cart
+                $this->checkRegistrationRequest($requestId);
+
+                if ($this->cart['status'] && $this->cart['validated']) {
+                    $haveRequest = true;
+                }
+
+            }
+
+        }
+
+        // If this is a guest then try to create the account using the submitted data
+        if ($this->cart['request']['account'] == 0) {
+
+            $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config);
+            $newAccount = $Account->insertEntry();
+echo "<p>Name = ".$_REQUEST['lname'].", ".$_REQUEST['fname']."</p>";
+echo "New Account<pre>".print_r($newAccount,1)."</pre>";
+exit;
+
+
+        }
+// echo "<pre>".print_r($this->cart,1)."</pre>";
+
+        $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config);
+
+        //
+
         /*
          * Initial Checks
          */
 
-        // Do we have a current login account
+        // If there's a logged in registrations user
+        if (isset($_SESSION) && isset($_SESSION['LoginAccount']) &&
+            is_array($_SESSION['LoginAccount']) &&
+            isset($_SESSION['LoginAccount']['id'])
+        ) {
+
+            $accountId = ($_SESSION['LoginAccount']['id'] - 0);
+
+            // Try to get the account
+            if ($accountId > 0) {
+                $regAccount = $Account->getEntry($accountId);
+            }
+
+        }
+
+        // If there wasn't an existing submission account
+        if (!$regAccount) {
+
+            // Create an account now
+
+        }
 
             // If not, then is guest checkout permitted?
 
index 2f6753b..830dac3 100644 (file)
@@ -93,6 +93,7 @@ class GlmMembersFront_registrations_index
                 'registration',
                 'cart',
                 'checkout',
+                'checkoutProcess',
                 'summary',
                 'login',
                 'account',
index 55adf32..0872fca 100644 (file)
            // Get a current list of reg events
             $listResult = $this->getSimpleRegEventsList($where.$alphaWhere, 'event_name', true, 'id', $start, $limit, true);
 
-            //echo '<pre>$listResult: ' . print_r( $listResult, true ) . '</pre>';
-
             // Get paging results
             $numbDisplayed = $listResult['returned'];
             $lastDisplayed = $listResult['last'];
index 08fd77e..4bebe6f 100644 (file)
@@ -63,6 +63,7 @@ add_filter(
         $regCartSummary['cartUrl'] = GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/?page=cart';
 
         return $regCartSummary;
+
     },
     10,
     2
index 176ed4d..157d879 100644 (file)
@@ -28,7 +28,7 @@
         <table id="glm-table-account" class="glm-admin-table glm-account-table">
 
         <tr>
-            <th {if $account.fieldRequired.date_created} class="glm-required"}{/if}>Date Created</th>
+            <th {if $account.fieldRequired.date_created} class="glm-required"{/if}>Date Created</th>
             <td {if $account.fieldFail.date_created}class="glm-form-bad-input" data-tabid="glm-date-created"{/if}>
             {$account.fieldData.date_created.timestamp|date_format:"%D"}
             <input type="hidden" name="date_created" value="{$account.fieldData.date_created.timestamp|date_format:"%D"}">
@@ -37,7 +37,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.user_trace_info} class="glm-required"}{/if}>User Trace Info</th>
+            <th {if $account.fieldRequired.user_trace_info} class="glm-required"{/if}>User Trace Info</th>
             <td {if $account.fieldFail.user_trace_info}class="glm-form-bad-input" data-tabid="glm-user-trace-info"{/if}>
             {$account.fieldData.user_trace_info}
             {if $account.fieldFail.user_trace_info}<p>{$account.fieldFail.user_trace_info}</p>{/if}<br>
@@ -45,7 +45,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.member_id} class="glm-required"}{/if}>Member ID</th>
+            <th {if $account.fieldRequired.member_id} class="glm-required"{/if}>Member ID</th>
             <td {if $account.fieldFail.member_id}class="glm-form-bad-input" data-tabid="glm-member-id"{/if}>
                 <input type="text" name="member_id" value="{$account.fieldData.member_id}" class="glm-form-text-input-short">
             {if $account.fieldFail.member_id}<p>{$account.fieldFail.member_id}</p>{/if}<br>
@@ -53,7 +53,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.active} class="glm-required"}{/if}>Active</th>
+            <th {if $account.fieldRequired.active} class="glm-required"{/if}>Active</th>
             <td {if $account.fieldFail.active}class="glm-form-bad-input" data-tabid="glm-active"{/if}>
                 <input type="checkbox" name="active" {if $account.fieldData.active.value} checked{/if}>
             {if $account.fieldFail.active}<p>{$account.fieldFail.active}</p>{/if}<br>
@@ -63,7 +63,7 @@
         <tr><th colspan="2"><p><h3>General Information</h3></p></th></tr>
 
         <tr>
-            <th {if $account.fieldRequired.fname} class="glm-required"}{/if}>First Name</th>
+            <th {if $account.fieldRequired.fname} class="glm-required"{/if}>First Name</th>
             <td {if $account.fieldFail.fname}class="glm-form-bad-input" data-tabid="glm-fname"{/if}>
                 <input type="text" name="fname" value="{$account.fieldData.fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.fname}<p>{$account.fieldFail.fname}</p>{/if}<br>
@@ -71,7 +71,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.lname} class="glm-required"}{/if}>Last Name</th>
+            <th {if $account.fieldRequired.lname} class="glm-required"{/if}>Last Name</th>
             <td {if $account.fieldFail.lname}class="glm-form-bad-input" data-tabid="glm-lname"{/if}>
                 <input type="text" name="lname" value="{$account.fieldData.lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.lname}<p>{$account.fieldFail.lname}</p>{/if}<br>
@@ -79,7 +79,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.org} class="glm-required"}{/if}>Organization</th>
+            <th {if $account.fieldRequired.org} class="glm-required"{/if}>Organization</th>
             <td {if $account.fieldFail.org}class="glm-form-bad-input" data-tabid="glm-org"{/if}>
                 <input type="text" name="org" value="{$account.fieldData.org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.org}<p>{$account.fieldFail.org}</p>{/if}<br>
@@ -87,7 +87,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.title} class="glm-required"}{/if}>Title</th>
+            <th {if $account.fieldRequired.title} class="glm-required"{/if}>Title</th>
             <td {if $account.fieldFail.title}class="glm-form-bad-input" data-tabid="glm-title"{/if}>
                 <input type="text" name="title" value="{$account.fieldData.title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.title}<p>{$account.fieldFail.title}</p>{/if}<br>
@@ -95,7 +95,7 @@
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.addr1} class="glm-required"}{/if}>Address 1</th>
+            <th {if $account.fieldRequired.addr1} class="glm-required"{/if}>Address 1</th>
             <td {if $account.fieldFail.addr1}class="glm-form-bad-input" data-tabid="glm-addr1"{/if}>
                 <input type="text" name="addr1" value="{$account.fieldData.addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.addr1}<p>{$account.fieldFail.addr1}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.addr2} class="glm-required"}{/if}>Address 2</th>
+            <th {if $account.fieldRequired.addr2} class="glm-required"{/if}>Address 2</th>
             <td {if $account.fieldFail.addr2}class="glm-form-bad-input" data-tabid="glm-addr2"{/if}>
                 <input type="text" name="addr2" value="{$account.fieldData.addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.addr2}<p>{$account.fieldFail.addr2}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.city} class="glm-required"}{/if}>City</th>
+            <th {if $account.fieldRequired.city} class="glm-required"{/if}>City</th>
             <td {if $account.fieldFail.city}class="glm-form-bad-input" data-tabid="glm-city"{/if}>
                 <input type="text" name="city" value="{$account.fieldData.city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.city}<p>{$account.fieldFail.city}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.state} class="glm-required"}{/if}>State</th>
+            <th {if $account.fieldRequired.state} class="glm-required"{/if}>State</th>
             <td {if $account.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-state"{/if}>
                 <input type="text" name="state" value="{$account.fieldData.state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.state}<p>{$account.fieldFail.state}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.zip} class="glm-required"}{/if}>ZIP</th>
+            <th {if $account.fieldRequired.zip} class="glm-required"{/if}>ZIP</th>
             <td {if $account.fieldFail.zip}class="glm-form-bad-input" data-tabid="glm-zip"{/if}>
                 <input type="text" name="zip" value="{$account.fieldData.zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.zip}<p>{$account.fieldFail.zip}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.country} class="glm-required"}{/if}>Country</th>
+            <th {if $account.fieldRequired.country} class="glm-required"{/if}>Country</th>
             <td {if $account.fieldFail.country}class="glm-form-bad-input" data-tabid="glm-country"{/if}>
                 <input type="text" name="country" value="{$account.fieldData.country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.country}<p>{$account.fieldFail.country}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.phone} class="glm-required"}{/if}>Phone</th>
+            <th {if $account.fieldRequired.phone} class="glm-required"{/if}>Phone</th>
             <td {if $account.fieldFail.phone}class="glm-form-bad-input" data-tabid="glm-phone"{/if}>
                 <input type="text" name="phone" value="{$account.fieldData.phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.phone}<p>{$account.fieldFail.phone}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.fax} class="glm-required"}{/if}>Fax</th>
+            <th {if $account.fieldRequired.fax} class="glm-required"{/if}>Fax</th>
             <td {if $account.fieldFail.fax}class="glm-form-bad-input" data-tabid="glm-fax"{/if}>
                 <input type="text" name="fax" value="{$account.fieldData.fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.fax}<p>{$account.fieldFail.fax}</p>{/if}<br>
         <tr><th colspan="2"><p><h3>Billing Information</h3></p></th></tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_fname} class="glm-required"}{/if}>First Name</th>
+            <th {if $account.fieldRequired.bill_fname} class="glm-required"{/if}>First Name</th>
             <td {if $account.fieldFail.bill_fname}class="glm-form-bad-input" data-tabid="glm-bill-fname"{/if}>
                 <input type="text" name="bill_fname" value="{$account.fieldData.bill_fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_fname}<p>{$account.fieldFail.bill_fname}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_lname} class="glm-required"}{/if}>Last Name</th>
+            <th {if $account.fieldRequired.bill_lname} class="glm-required"{/if}>Last Name</th>
             <td {if $account.fieldFail.bill_lname}class="glm-form-bad-input" data-tabid="glm-bill-lname"{/if}>
                 <input type="text" name="bill_lname" value="{$account.fieldData.bill_lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_lname}<p>{$account.fieldFail.bill_lname}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_org} class="glm-required"}{/if}>Organization</th>
+            <th {if $account.fieldRequired.bill_org} class="glm-required"{/if}>Organization</th>
             <td {if $account.fieldFail.bill_org}class="glm-form-bad-input" data-tabid="glm-bill-org"{/if}>
                 <input type="text" name="bill_org" value="{$account.fieldData.bill_org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_org}<p>{$account.fieldFail.bill_org}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_title} class="glm-required"}{/if}>Title</th>
+            <th {if $account.fieldRequired.bill_title} class="glm-required"{/if}>Title</th>
             <td {if $account.fieldFail.bill_title}class="glm-form-bad-input" data-tabid="glm-bill-title"{/if}>
                 <input type="text" name="bill_title" value="{$account.fieldData.bill_title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_title}<p>{$account.fieldFail.bill_title}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_addr1} class="glm-required"}{/if}>Address 1</th>
+            <th {if $account.fieldRequired.bill_addr1} class="glm-required"{/if}>Address 1</th>
             <td {if $account.fieldFail.bill_addr1}class="glm-form-bad-input" data-tabid="glm-bill-addr1"{/if}>
                 <input type="text" name="bill_addr1" value="{$account.fieldData.bill_addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_addr1}<p>{$account.fieldFail.bill_addr1}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_addr2} class="glm-required"}{/if}>Address 2</th>
+            <th {if $account.fieldRequired.bill_addr2} class="glm-required"{/if}>Address 2</th>
             <td {if $account.fieldFail.bill_addr2}class="glm-form-bad-input" data-tabid="glm-bill-addr2"{/if}>
                 <input type="text" name="bill_addr2" value="{$account.fieldData.bill_addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_addr2}<p>{$account.fieldFail.bill_addr2}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_city} class="glm-required"}{/if}>City</th>
+            <th {if $account.fieldRequired.bill_city} class="glm-required"{/if}>City</th>
             <td {if $account.fieldFail.bill_city}class="glm-form-bad-input" data-tabid="glm-bill-city"{/if}>
                 <input type="text" name="bill_city" value="{$account.fieldData.bill_city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_city}<p>{$account.fieldFail.bill_city}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_state} class="glm-required"}{/if}>State</th>
+            <th {if $account.fieldRequired.bill_state} class="glm-required"{/if}>State</th>
             <td {if $account.fieldFail.bill_state}class="glm-form-bad-input" data-tabid="glm-bill-state"{/if}>
                 <input type="text" name="bill_state" value="{$account.fieldData.bill_state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_state}<p>{$account.fieldFail.bill_state}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_zip} class="glm-required"}{/if}>ZIP</th>
+            <th {if $account.fieldRequired.bill_zip} class="glm-required"{/if}>ZIP</th>
             <td {if $account.fieldFail.bill_zip}class="glm-form-bad-input" data-tabid="glm-bill-zip"{/if}>
                 <input type="text" name="bill_zip" value="{$account.fieldData.bill_zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_zip}<p>{$account.fieldFail.bill_zip}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_country} class="glm-required"}{/if}>Country</th>
+            <th {if $account.fieldRequired.bill_country} class="glm-required"{/if}>Country</th>
             <td {if $account.fieldFail.bill_country}class="glm-form-bad-input" data-tabid="glm-bill-country"{/if}>
                 <input type="text" name="bill_country" value="{$account.fieldData.bill_country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_country}<p>{$account.fieldFail.bill_country}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_phone} class="glm-required"}{/if}>Phone</th>
+            <th {if $account.fieldRequired.bill_phone} class="glm-required"{/if}>Phone</th>
             <td {if $account.fieldFail.bill_phone}class="glm-form-bad-input" data-tabid="glm-bill-phone"{/if}>
                 <input type="text" name="bill_phone" value="{$account.fieldData.bill_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_phone}<p>{$account.fieldFail.bill_phone}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.bill_fax} class="glm-required"}{/if}>Fax</th>
+            <th {if $account.fieldRequired.bill_fax} class="glm-required"{/if}>Fax</th>
             <td {if $account.fieldFail.bill_fax}class="glm-form-bad-input" data-tabid="glm-bill-fax"{/if}>
                 <input type="text" name="bill_fax" value="{$account.fieldData.bill_fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.bill_fax}<p>{$account.fieldFail.bill_fax}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.email} class="glm-required"}{/if}>Email</th>
+            <th {if $account.fieldRequired.email} class="glm-required"{/if}>Email</th>
             <td {if $account.fieldFail.email}class="glm-form-bad-input" data-tabid="glm-email"{/if}>
                 <input type="text" name="email" value="{$account.fieldData.email}" class="glm-form-text-input-medium">
             {if $account.fieldFail.email}<p>{$account.fieldFail.email}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.password} class="glm-required"}{/if}>Login Password</th>
+            <th {if $account.fieldRequired.password} class="glm-required"{/if}>Login Password</th>
             <td {if $account.fieldFail.password}class="glm-form-bad-input" data-tabid="glm-password"{/if}>
                 <input type="text" name="password" value="{$account.fieldData.password}" class="glm-form-text-input-medium" placeholder="{if $option=='create'}(no spaces permitted){else}(Password does not show, only enter to change password.){/if}">
                 {if $option == 'create'}
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.email_ok} class="glm-required"}{/if}>Email OK?</th>
+            <th {if $account.fieldRequired.email_ok} class="glm-required"{/if}>Email OK?</th>
             <td {if $account.fieldFail.email_ok}class="glm-form-bad-input" data-tabid="glm-email-ok"{/if}>
                 <input type="checkbox" name="email_ok" {if $account.fieldData.email_ok.value} checked{/if}>
             {if $account.fieldFail.email_ok}<p>{$account.fieldFail.email_ok}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.is_member} class="glm-required"}{/if}>Is Member?</th>
+            <th {if $account.fieldRequired.is_member} class="glm-required"{/if}>Is Member?</th>
             <td {if $account.fieldFail.is_member}class="glm-form-bad-input" data-tabid="glm-is-member"{/if}>
                 <input type="checkbox" name="is_member" {if $account.fieldData.is_member.value} checked{/if}>
             {if $account.fieldFail.is_member}<p>{$account.fieldFail.is_member}</p>{/if}<br>
         <tr><th colspan="2"><p><h3>Contact Information</h3></p></th></tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_fname} class="glm-required"}{/if}>First Name</th>
+            <th {if $account.fieldRequired.contact_fname} class="glm-required"{/if}>First Name</th>
             <td {if $account.fieldFail.contact_fname}class="glm-form-bad-input" data-tabid="glm-contact-fname"{/if}>
                 <input type="text" name="contact_fname" value="{$account.fieldData.contact_fname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_fname}<p>{$account.fieldFail.contact_fname}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_lname} class="glm-required"}{/if}>Last Name</th>
+            <th {if $account.fieldRequired.contact_lname} class="glm-required"{/if}>Last Name</th>
             <td {if $account.fieldFail.contact_lname}class="glm-form-bad-input" data-tabid="glm-contact-lname"{/if}>
                 <input type="text" name="contact_lname" value="{$account.fieldData.contact_lname}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_lname}<p>{$account.fieldFail.contact_lname}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_org} class="glm-required"}{/if}>Organization</th>
+            <th {if $account.fieldRequired.contact_org} class="glm-required"{/if}>Organization</th>
             <td {if $account.fieldFail.contact_org}class="glm-form-bad-input" data-tabid="glm-contact-org"{/if}>
                 <input type="text" name="contact_org" value="{$account.fieldData.contact_org}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_org}<p>{$account.fieldFail.contact_org}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_title} class="glm-required"}{/if}>Title</th>
+            <th {if $account.fieldRequired.contact_title} class="glm-required"{/if}>Title</th>
             <td {if $account.fieldFail.contact_title}class="glm-form-bad-input" data-tabid="glm-contact-title"{/if}>
                 <input type="text" name="contact_title" value="{$account.fieldData.contact_title}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_title}<p>{$account.fieldFail.contact_title}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_addr1} class="glm-required"}{/if}>Address 1</th>
+            <th {if $account.fieldRequired.contact_addr1} class="glm-required"{/if}>Address 1</th>
             <td {if $account.fieldFail.contact_addr1}class="glm-form-bad-input" data-tabid="glm-contact-addr1"{/if}>
                 <input type="text" name="contact_addr1" value="{$account.fieldData.contact_addr1}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_addr1}<p>{$account.fieldFail.contact_addr1}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_addr2} class="glm-required"}{/if}>Address 2</th>
+            <th {if $account.fieldRequired.contact_addr2} class="glm-required"{/if}>Address 2</th>
             <td {if $account.fieldFail.contact_addr2}class="glm-form-bad-input" data-tabid="glm-contact-addr2"{/if}>
                 <input type="text" name="contact_addr2" value="{$account.fieldData.contact_addr2}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_addr2}<p>{$account.fieldFail.contact_addr2}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_city} class="glm-required"}{/if}>City</th>
+            <th {if $account.fieldRequired.contact_city} class="glm-required"{/if}>City</th>
             <td {if $account.fieldFail.contact_city}class="glm-form-bad-input" data-tabid="glm-contact-cite"{/if}>
                 <input type="text" name="contact_city" value="{$account.fieldData.contact_city}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_city}<p>{$account.fieldFail.contact_city}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_state} class="glm-required"}{/if}>State</th>
+            <th {if $account.fieldRequired.contact_state} class="glm-required"{/if}>State</th>
             <td {if $account.fieldFail.contact_state}class="glm-form-bad-input" data-tabid="glm-contact-state"{/if}>
                 <input type="text" name="contact_state" value="{$account.fieldData.contact_state}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_state}<p>{$account.fieldFail.contact_state}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_zip} class="glm-required"}{/if}>ZIP</th>
+            <th {if $account.fieldRequired.contact_zip} class="glm-required"{/if}>ZIP</th>
             <td {if $account.fieldFail.contact_zip}class="glm-form-bad-input" data-tabid="glm-contact-zip"{/if}>
                 <input type="text" name="contact_zip" value="{$account.fieldData.contact_zip}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_zip}<p>{$account.fieldFail.contact_zip}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_country} class="glm-required"}{/if}>Country</th>
+            <th {if $account.fieldRequired.contact_country} class="glm-required"{/if}>Country</th>
             <td {if $account.fieldFail.contact_country}class="glm-form-bad-input" data-tabid="glm-contact-country"{/if}>
                 <input type="text" name="contact_country" value="{$account.fieldData.contact_country}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_country}<p>{$account.fieldFail.contact_country}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_phone} class="glm-required"}{/if}>Contact Phone</th>
+            <th {if $account.fieldRequired.contact_phone} class="glm-required"{/if}>Contact Phone</th>
             <td {if $account.fieldFail.contact_phone}class="glm-form-bad-input" data-tabid="glm-contact-phone"{/if}>
                 <input type="text" name="contact_phone" value="{$account.fieldData.contact_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_phone}<p>{$account.fieldFail.contact_phone}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_fax} class="glm-required"}{/if}>Contact Fax</th>
+            <th {if $account.fieldRequired.contact_fax} class="glm-required"{/if}>Contact Fax</th>
             <td {if $account.fieldFail.contact_fax}class="glm-form-bad-input" data-tabid="glm-contact-fax"{/if}>
                 <input type="text" name="contact_fax" value="{$account.fieldData.contact_fax}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_fax}<p>{$account.fieldFail.contact_fax}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_email} class="glm-required"}{/if}>Contact Email</th>
+            <th {if $account.fieldRequired.contact_email} class="glm-required"{/if}>Contact Email</th>
             <td {if $account.fieldFail.contact_email}class="glm-form-bad-input" data-tabid="glm-contact-email"{/if}>
                 <input type="text" name="contact_email" value="{$account.fieldData.contact_email}" class="glm-form-text-input-medium">
             {if $account.fieldFail.contact_email}<p>{$account.fieldFail.contact_email}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.contact_email_ok} class="glm-required"}{/if}>Contact Email OK?</th>
+            <th {if $account.fieldRequired.contact_email_ok} class="glm-required"{/if}>Contact Email OK?</th>
             <td {if $account.fieldFail.contact_email_ok}class="glm-form-bad-input" data-tabid="glm-contact-email-ok"{/if}>
                 <input type="checkbox" name="contact_email_ok" {if $account.fieldData.contact_email_ok.value} checked{/if}>
             {if $account.fieldFail.contact_email_ok}<p>{$account.fieldFail.contact_email_ok}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.guardian} class="glm-required"}{/if}>Guardian</th>
+            <th {if $account.fieldRequired.guardian} class="glm-required"{/if}>Guardian</th>
             <td {if $account.fieldFail.guardian}class="glm-form-bad-input" data-tabid="glm-guardian"{/if}>
                 <input type="text" name="guardian" value="{$account.fieldData.guardian}" class="glm-form-text-input-medium">
             {if $account.fieldFail.guardian}<p>{$account.fieldFail.guardian}</p>{/if}<br>
 
 
         <tr>
-            <th {if $account.fieldRequired.emer_contact} class="glm-required"}{/if}>Emergency Contact</th>
+            <th {if $account.fieldRequired.emer_contact} class="glm-required"{/if}>Emergency Contact</th>
             <td {if $account.fieldFail.emer_contact}class="glm-form-bad-input" data-tabid="glm-emer-contact"{/if}>
                 <input type="text" name="emer_contact" value="{$account.fieldData.emer_contact}" class="glm-form-text-input-medium">
             {if $account.fieldFail.emer_contact}<p>{$account.fieldFail.emer_contact}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.emer_phone} class="glm-required"}{/if}>Emergency Phone</th>
+            <th {if $account.fieldRequired.emer_phone} class="glm-required"{/if}>Emergency Phone</th>
             <td {if $account.fieldFail.emer_phone}class="glm-form-bad-input" data-tabid="glm-emer-phone"{/if}>
                 <input type="text" name="emer_phone" value="{$account.fieldData.emer_phone}" class="glm-form-text-input-medium">
             {if $account.fieldFail.emer_phone}<p>{$account.fieldFail.emer_phone}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.med_history} class="glm-required"}{/if}>Medical History</th>
+            <th {if $account.fieldRequired.med_history} class="glm-required"{/if}>Medical History</th>
             <td {if $account.fieldFail.med_history}class="glm-form-bad-input" data-tabid="glm-med-history"{/if}>
                 <input type="text" name="med_history" value="{$account.fieldData.med_history}" class="glm-form-text-input-medium">
             {if $account.fieldFail.med_history}<p>{$account.fieldFail.med_history}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.allergy_med} class="glm-required"}{/if}>Allergy Medication</th>
+            <th {if $account.fieldRequired.allergy_med} class="glm-required"{/if}>Allergy Medication</th>
             <td {if $account.fieldFail.allergy_med}class="glm-form-bad-input" data-tabid="glm-allergy-med"{/if}>
                 <input type="text" name="allergy_med" value="{$account.fieldData.allergy_med}" class="glm-form-text-input-medium">
             {if $account.fieldFail.allergy_med}<p>{$account.fieldFail.allergy_med}</p>{/if}<br>
         </tr>
 
         <tr>
-            <th {if $account.fieldRequired.notes} class="glm-required"}{/if}>Notes</th>
+            <th {if $account.fieldRequired.notes} class="glm-required"{/if}>Notes</th>
             <td {if $account.fieldFail.notes}class="glm-form-bad-input" data-tabid="glm-notes"{/if}>
             <textarea name="notes" class="glm-form-textarea">{$account.fieldData.notes}</textarea>
             {if $account.fieldFail.notes}
index e029df6..6ee49d2 100644 (file)
         </div>
     </div>
 </a>
-<div id="glm-cart-select-dialog" title="Pending Registration Requests" class="glm-hidden" style="width: 100%">
+<div id="glm-cart-select-dialog" title="Pending Registration Requests (carts)" class="glm-hidden" style="width: 100%">
         <center>
             <table>
                 <thead>
-                    <tr><th>ID</th><th style="white-space: nowrap;">Date created</th><th style="white-space: nowrap;">Date last updated</th></tr>
+                    <tr><th>ID</th><th style="white-space: nowrap;">Date created</th><th style="white-space: nowrap;">Date last updated</th><th>Selected</th></tr>
                 </thead>
                 <tbody>
             {foreach $regRequests as $rr}
                     <tr>
-                        <td><a href="{$cartUrl}&cartId={$rr.id}">{$rr.id}</a></td>
+                        <td>
+                            <a href="{$cartUrl}&cartId={$rr.id}">{$rr.id}</a>
+                        </td>
                         <td style="white-space: nowrap;">{$rr.date_created.datetime}</td>
                         <td style="white-space: nowrap;">{$rr.last_update.datetime}</td>
+                        <td>
+              {if $rr.id == $id}
+                            Yes
+              {/if}
+                        </td>
                     </tr>
             {/foreach}
                 </tbody>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
 
-        $("#glm-cart-select-action").click(function () {
+        pendDialog = $("#glm-cart-select-action").click(function () {
             $("#glm-cart-select-dialog").dialog({
                 autoOpen: true,
                 resizable: false,
                 modal: true,
-                width: 400
+                width: 500,
+                closeText: "hide",
+                buttons: {
+                    "Cancel": function () {
+                        $(this).dialog("close");
+                    }
+                } 
             });
         });
-                    
+
     });
 </script>
 {/if}
index 9d922e6..5def0b1 100644 (file)
 {include file='front/registrations/header.html'}
 
 {if $haveCart}
-    <form>
+    <form href="{$regUrl}?page=checkoutProcess">
         {* Hidden fields go here *}
 
-    <div class="glm-reg-checkout">
+        <a href="#cart-summary">See summary of registration request and charges below</a>
 
-        <h3>Checkout</h3>
+        <div id="glm-reg-checkout-form">
 
-        <h4>Account Information</h4>
-        <div>
-            <input type="email" class="glm-form-input" placeholder="*Email Address" name="email" value="" required>
-            <input type="password" class="glm-form-input" placeholder="*Password" name="password" value="" required>
+            <div>
+                <div class="glm-right" style="white-space; nowrap; padding-top: 1em;">
+                    <span class="glm-reg-warning">Your registration is not complete! Please complete the form and click "Submit" below.</span> <img src="{$assetUrl}/fingerDownRed.svg" style="height: 2em;">
+                </div>
+                <h3 class="glm-left" style="clear: none;">Checkout</h3>
+            </div>
+            
+            <div class="glm-reg-row">
+                <div class="glm-large-6 glm-columns">
+                    <h4>Account Information</h4>
+  {if $regAccountId == 0}
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.email} glm-reg-required{/if}">E-Mail Address:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.password} glm-reg-required{/if}">Password:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.password} glm-reg-fail{/if}"><input type="password" name="password" value=""{if $regAccount.fieldRequired.password} required{/if}></div>
+                    </div>
+  {else}
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap">E-Mail Address:</div>
+                        <div class="glm-large-9 glm-columns">{$regAccount.fieldData.email}</div>
+                    </div>
+  {/if}                    
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.fname} glm-reg-required{/if}">First Name:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.lname} glm-reg-required{/if}">Last Name:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.org} glm-reg-required{/if}">Organization:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.title} glm-reg-required{/if}">Title:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.addr1} glm-reg-required{/if}">Address:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.addr2} glm-reg-required{/if}">&nbsp;</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.addr1} 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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.city} glm-reg-required{/if}">City:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.state} glm-reg-required{/if}">State/Province:</div>
+                        <div class="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 $memberInfo.fieldData.state.value == $s.value} selected="selected"{/if}>
+                                    {$s.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.zip} glm-reg-required{/if}">Zip/Postal Code:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.country} glm-reg-required{/if}">Country:</div>
+                        <div class="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 $memberInfo.fieldData.country.value == $c.value} selected="selected"{/if}>
+                                    {$c.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="glm-large-6 glm-columns" style="">
+                    <div class="glm-reg-row"><div class="glm-large-12 glm-columns"><h4>Billing Information</h4></div></div>
+                    <div class="glm-reg-row"><div class="glm-large-12 glm-columns"><input type="checkbox" name="billing_same">&nbsp;Same as Account Information</div></div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_fname} glm-reg-required{/if}">First Name:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_lname} glm-reg-required{/if}">Last Name:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_addr1} glm-reg-required{/if}">Address:</div>
+                        <div class="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>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_addr2} glm-reg-required{/if}">&nbsp;</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.bill_addr1} 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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_city} glm-reg-required{/if}">City:</div>
+                        <div class="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">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_state} glm-reg-required{/if}">State:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.bill_state} glm-reg-fail{/if}">
+                            <select name="bill_state">
+                                <option value=""></option>
+                    {foreach $regAccount.fieldData.bill_state.list as $s}
+                                <option value="{$s.value}"{if $memberInfo.fieldData.bill_state.value == $s.value} selected="selected"{/if}>
+                                    {$s.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_zip} glm-reg-required{/if}">Zip/Postal Code:</div>
+                        <div class="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>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_country} glm-reg-required{/if}">Country:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.bill_country} glm-reg-fail{/if}">
+                            <select name="bill_country">
+                                <option value=""></option>
+                    {foreach $regAccount.fieldData.bill_country.list as $c}
+                                <option value="{$c.value}"{if $memberInfo.fieldData.bill_country.value == $c.value} selected="selected"{/if}>
+                                    {$c.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_phone} glm-reg-required{/if}">Phone:</div>
+                        <div class="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>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.bill_fax} glm-reg-required{/if}">FAX:</div>
+                        <div class="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>
+            </div>
+  {if $cart.totalCharges > 0}            
+            <div class="glm-reg-row">
+                <div class="glm-large-6 glm-columns">
+                    <h4>Payment Information</h4>
+                    <p>*** Temporary - will depend on payment methods ***</p>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_type} glm-reg-required{/if}">Card Type:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_type} glm-reg-fail{/if}"><input type="text" name="cc_type" value="{$regAccount.fieldData.cc_type}"{if $regAccount.fieldRequired.cc_type} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_name} glm-reg-required{/if}">Name on Card:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}"><input type="text" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_numb} glm-reg-required{/if}">Card Number:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_numb} glm-reg-fail{/if}"><input type="text" placeholder="Numbers Only" name="cc_numb" value="{$regAccount.fieldData.cc_numb}"{if $regAccount.fieldRequired.cc_numb} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_exp} glm-reg-required{/if}">Card Expiration:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_exp} glm-reg-fail{/if}"><input type="text" placeholder="MM/YY" name="cc_exp" value="{$regAccount.fieldData.cc_exp}"{if $regAccount.fieldRequired.cc_exp} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_cvv} glm-reg-required{/if}">CVV:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}"><input type="text" placeholder="3 digit number on back of card" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if}></div>
+                    </div>                    
+                </div>
+  {/if}                
+                <div class="glm-large-6 glm-columns">
+                    <h4>Additional Contact Information</h4>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_fname} glm-reg-required{/if}">First Name:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_fname} glm-reg-fail{/if}"><input type="text" name="contact_fname" value="{$regAccount.fieldData.contact_fname}"{if $regAccount.fieldRequired.contact_fname} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_addr1} glm-reg-required{/if}">Address:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_addr1} glm-reg-fail{/if}"><input type="text" name="contact_addr1" value="{$regAccount.fieldData.contact_addr1}"{if $regAccount.fieldRequired.contact_addr1} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_addr2} glm-reg-required{/if}">&nbsp;</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_addr2} glm-reg-fail{/if}"><input type="text" name="contact_addr2" value="{$regAccount.fieldData.contact_addr2}"{if $regAccount.fieldRequired.contact_addr2} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_city} glm-reg-required{/if}">City:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_city} glm-reg-fail{/if}"><input type="text" name="contact_city" value="{$regAccount.fieldData.contact_city}"{if $regAccount.fieldRequired.contact_city} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_state} glm-reg-required{/if}">State:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_state} glm-reg-fail{/if}">
+                            <select name="contact_state">
+                                <option value=""></option>
+                    {foreach $regAccount.fieldData.contact_state.list as $s}
+                                <option value="{$s.value}"{if $memberInfo.fieldData.contact_state.value == $s.value} selected="selected"{/if}>
+                                    {$s.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_zip} glm-reg-required{/if}">Zip/Postal Code:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_zip} glm-reg-fail{/if}"><input type="text" name="contact_zip" value="{$regAccount.fieldData.contact_zip}"{if $regAccount.fieldRequired.contact_zip} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_country} glm-reg-required{/if}">Country:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_country} glm-reg-fail{/if}">
+                            <select name="contact_country">
+                                <option value=""></option>
+                    {foreach $regAccount.fieldData.contact_country.list as $c}
+                                <option value="{$c.value}"{if $memberInfo.fieldData.contact_country.value == $c.value} selected="selected"{/if}>
+                                    {$c.name}
+                                </option>
+                    {/foreach}
+                            </select>
+                        </div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_email} glm-reg-required{/if}">E-mail:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_email} glm-reg-fail{/if}"><input type="text" name="contact_email" value="{$regAccount.fieldData.contact_email}"{if $regAccount.fieldRequired.contact_email} required{/if}></div>
+                    </div>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_phone} glm-reg-required{/if}">Phone:</div>
+                        <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_phone} glm-reg-fail{/if}"><input type="text" name="contact_phone" value="{$regAccount.fieldData.contact_phone}"{if $regAccount.fieldRequired.contact_phone} required{/if}></div>
+                    </div>
+                </div>
+            </div>
+            <div class="glm-reg-row">
+                <div class="glm-large-6 glm-columns">
+                    <h4>Global Custom Fields Go Here</h4>
+                    <div class="glm-reg-row">
+                        <div class="glm-large-12 glm-columns"></div>Custom fields that are event, level, rate, or registrant specific will be collected on registration selection page.</div>
+                    </dic>
+                </div>
+            </div>
         </div>
-        <div>
-            <input class="glm-form-input" placeholder="*First Name" name="fname" value="{$reg.fname}" required>
-            <input class="glm-form-input" placeholder="*Last Name" name="lname" value="{$reg.lname}" required>
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Address 1" name="addr1" value="{$reg.addr1}" required>
-            <input class="glm-form-input" placeholder="Address 2" name="addr2" value="{$reg.addr2}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="City" name="city" value="{$reg.city}" required>
-            <input class="glm-form-input" placeholder="State" name="state" value="{$reg.state}" required>
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Zip/Postal Code" name="zip" value="{$reg.zip}" required>
-            <input class="glm-form-input" placeholder="Country" name="country" value="{$reg.country}">
-        </div>
-
-        <h4>Billing Information</h4>
-        <div>
-            <input class="glm-form-input" placeholder="*First Name" name="bill_fname" value="{$reg.bill_fname}" required>
-            <input class="glm-form-input" placeholder="*Last Name" name="bill_lname" value="{$reg.bill_lname}" required>
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Address 1" name="bill_addr1" value="{$reg.bill_addr1}" required>
-            <input class="glm-form-input" placeholder="Address 2" name="bill_addr2" value="{$reg.bill_addr2}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="City" name="bill_city" value="{$reg.bill_city}" required>
-            <input class="glm-form-input" placeholder="State" name="bill_state" value="{$reg.bill_state}" required>
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Zip/Postal Code" name="bill_zip" value="{$reg.bill_zip}" required>
-            <input class="glm-form-input" placeholder="Country" name="bill_country" value="{$reg.bill_country}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Phone" name="bill_phone" value="{$reg.bill_phone}" required>
-            <input class="glm-form-input" placeholder="Fax" name="bill_fax" value="{$reg.bill_fax}">
-        </div>
-
-        <h4>Contact Information</h4>
-        <div>
-            <input class="glm-form-input" placeholder="*First Name" name="contact_fname" value="{$reg.contact_fname}">
-            <input class="glm-form-input" placeholder="*Last Name" name="contact_lname" value="{$reg.contact_lname}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Address 1" name="contact_addr1" value="{$reg.contact_addr1}">
-            <input class="glm-form-input" placeholder="Address 2" name="contact_addr2" value="{$reg.contact_addr2}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="City" name="contact_city" value="{$reg.contact_city}">
-            <input class="glm-form-input" placeholder="State" name="contact_state" value="{$reg.contact_state}">
-        </div>
-        <div>
-            <input class="glm-form-input" placeholder="Zip/Postal Code" name="contact_zip" value="{$reg.contact_zip}">
-            <input class="glm-form-input" placeholder="Country" name="contact_country" value="{$reg.contact_country}">
-        </div>
-        <div>
-            <input type="email" class="glm-form-input" placeholder="Email Address" name="contact_email" value="{$reg.contact_email}">
-            <input type="email" class="glm-form-input" placeholder="Phone" name="contact_phone" value="{$reg.contact_phone}">
-        </div>
-
     </div>
 
-    <div style="text-align: right;"><h2>Total Charged: ${$cart.totalCharges|number_format:2}</h2></div>
+    {if $cart.totalCharges > 0} 
+        <div style="text-align: right;"><h2>Total Charged: ${$cart.totalCharges|number_format:2}</h2></div>
+    {else}
+        <div style="text-align: right;">(There is no charge for your request.)</div>
+    {/if}
 
     {if $cart.blockCheckout}
     <div>
     </div>
     {else}
     <div class="glm-right" style="white-space; nowrap;">
-        <span class="glm-reg-warning">You have one more step to complete your registration!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <a href="{$regUrl}?page=checkout" class="button tiny">Submit Registration</a>
-        or <a href="{$regUrl}?page=cart" class="button tiny">Return to Cart</a>
+        <span class="glm-reg-warning">You have one more step to complete your registration!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <input type="submit" name="Submit Registration" class="button tiny">
     </div>
     {/if}
 
     </form>
 
-    <h4>Registration Summary</h4>
+    <h4 id="cart-summary">Registration Summary</h4>
     <table class="glm-admin-table" width="100%">
 
         <thead>
index 51a6120..d404f3a 100644 (file)
@@ -11,5 +11,8 @@
     {if $page != 'register'}
         <a href="{$regUrl}" class="button tiny">Register for Another Event</a>
     {/if}
+    {if $page != 'cart'}
+        <a href="{$regUrl}?page=cart" class="button tiny">Return to Cart</a>
+    {/if}
     &nbsp;
 </div>