From efcf42189882440aa514a0c31c99ad60136cb525 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 19 Jul 2018 14:04:19 -0400
Subject: [PATCH] Cleaned up vareious invalid index references.

---
 classes/regCartSupport.php                       | 3 +--
 models/admin/registrations/requests.php          | 6 ++++--
 models/front/registrations/registration.php      | 1 -
 views/admin/registrations/eventRegistrants.html  | 2 +-
 views/admin/registrations/requestsDashboard.html | 1 -
 views/front/registrations/checkout.html          | 2 +-
 views/front/registrations/registration.html      | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/classes/regCartSupport.php b/classes/regCartSupport.php
index 4e35aa2..113e0e2 100644
--- a/classes/regCartSupport.php
+++ b/classes/regCartSupport.php
@@ -504,7 +504,6 @@ class GlmRegCartSupport
 
                                                     // Add some info from the time record to the registrant
                                                     $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['non_time_specific'] = $regEventTimes[$registrant['reg_time']]['non_time_specific']['value'];
-                                                    $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['reg_event_descr'] = $regEventTimes[$registrant['reg_time']]['descr'];
 
                                                 }
 
@@ -626,7 +625,7 @@ class GlmRegCartSupport
                                             'quantity' => 1,
                                             'name' =>
                                                 $this->config['terms']['reg_term_level_cap'].': '.$rate['rate_name'],
-                                            'price' => $rateBaseCharge + $rateDisconts
+                                            'price' => $rateBaseCharge + $rateDiscounts
                                         );
 
                                     }
diff --git a/models/admin/registrations/requests.php b/models/admin/registrations/requests.php
index a9d6e73..353566c 100644
--- a/models/admin/registrations/requests.php
+++ b/models/admin/registrations/requests.php
@@ -306,7 +306,10 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ
                 $where .= " AND T.status IN $statusWhere";
 
                 // Get selected ordering
-                $orderBy = $_REQUEST['orderBy'];
+                $orderBy = 'id';
+                if (isset($_REQUEST['orderBy'])) {
+                    $orderBy = $_REQUEST['orderBy'];
+                }
                 switch ($orderBy) {
 
                     case 'status':
@@ -424,7 +427,6 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ
             'haveRequests'  => $haveRequests,
             'requests'      => $requests,
             'requestsCount' => $requestsCount,
-            'orderBy'       => $orderBy,
             'haveRequest'   => $haveRequest,
             'requestID'     => $requestID,
             'cart'          => $cart,
diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php
index 01fecef..0d14fab 100644
--- a/models/front/registrations/registration.php
+++ b/models/front/registrations/registration.php
@@ -173,7 +173,6 @@
                 'attendee_max'         => $regEvent['attendee_max'],
                 'attendee_max_per_reg' => $regEvent['attendee_max_per_reg'],
                 'reg_hold_minutes'     => $regEvent['reg_hold_minutes'],
-                'cart_hold_days'       => $regEvent['cart_hold_days'],
                 'terms'                => $regEvent['terms'],
             );
 
diff --git a/views/admin/registrations/eventRegistrants.html b/views/admin/registrations/eventRegistrants.html
index bfb5b42..d0d4865 100644
--- a/views/admin/registrations/eventRegistrants.html
+++ b/views/admin/registrations/eventRegistrants.html
@@ -118,7 +118,7 @@
                     <span class="attendee-edit-link">
                         <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&accountID={$r.account.id}">View Account</a> 
                     </span>
-            {if $r.request_status.value == 0}
+            {if $r.request_status == 0}
                     |
                     <span class="attendee-edit-link">
                         <a href="{$regUrl}?page=cart&cartId={$r.reg_request}&cartCheck={$r.cartCheck}" target="_cart">Access Cart</a>
diff --git a/views/admin/registrations/requestsDashboard.html b/views/admin/registrations/requestsDashboard.html
index a79bd38..84758e3 100644
--- a/views/admin/registrations/requestsDashboard.html
+++ b/views/admin/registrations/requestsDashboard.html
@@ -12,7 +12,6 @@
 
 <form method="post" action="{$thisUrl}?page={$thisPage}">
     <input type="hidden" name="option" value="dashboard">
-    <input type="hidden" name="regEventID" value="{$regEvent.id}">
     <input type="hidden" name="prevStart" value="{$prevStart}">
     <input type="hidden" name="nextStart" value="{$nextStart}">
     <input type="hidden" name="limit" value="{$limit}">
diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html
index 17f34a4..7e41da3 100644
--- a/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@ -628,7 +628,7 @@
                             },
                             transactions: [
                                 {
-                                    description: '{$settings.reg_org_name} {$reg.term.registration_plur_cap}',
+                                    description: '{$settings.reg_org_name} {$terms.reg_term_registration_plur_cap}',
                                     invoice_number: '{$cartId}',
                                     amount: { 
                                         total: '{$cart.grandTotal}', 
diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 91ff944..318cefd 100644
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -311,7 +311,7 @@
                 {/literal}
                     {$fid_event = "glm_reg_customfields_reg_event_attendee_$regEventId"}
                 {literal}
-                {/literal}{if apply_filters('glm-members-customfields-have-fields', false, $fid)}{literal}
+                {/literal}{if apply_filters('glm-members-customfields-have-fields', false, $fid_event)}{literal}
                     <h4>Additional Info Needed</h4>
                 {/literal}{/if}{literal}
                 <form class="attendee-cf-form-new">
@@ -414,7 +414,7 @@
                         </div>
                     </div>
                     {/literal}{if apply_filters('glm-members-customfields-plugin-active', false)}{literal}
-                    {/literal}{if apply_filters('glm-members-customfields-have-fields', false, $fid)}{literal}
+                    {/literal}{if apply_filters('glm-members-customfields-have-fields', false, $fid_event)}{literal}
                         <h4>Additional Info Needed</h4>
                     {/literal}{/if}{literal}
                         <form class="attendee-cf-form-<%= id %>"><div class="attendee-cf-<%= id %>"></div></form>
-- 
2.17.1