Get rid of php notices for undefined variables.

Adding needed variables to the account Header template.

diff --git a/models/admin/ajax/regFront/registrant.php b/models/admin/ajax/regFront/registrant.php
index 37b16ea..1086866 100644 (file)
--- a/models/admin/ajax/regFront/registrant.php
+++ b/models/admin/ajax/regFront/registrant.php
@@ -82,7 +82,7 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
     {
 
         $validated = false;
-        trigger_error(print_r($modelData,1));
+        // trigger_error(print_r($modelData,1));
 
         if ( !isset( $modelData['option'] ) ) {
             $option = null;
@@ -500,7 +500,7 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
 
         // Store the custom field data
         $_REQUEST = $queryParams;
-        trigger_error(print_r($_REQUEST,1));
+        // trigger_error(print_r($_REQUEST,1));
         apply_filters(
             'glm-members-customfields-form-submit',
             '',

diff --git a/models/front/registrations/cartLinkWidget.php b/models/front/registrations/cartLinkWidget.php
index d322db9..beddaa0 100644 (file)
--- a/models/front/registrations/cartLinkWidget.php
+++ b/models/front/registrations/cartLinkWidget.php
@@ -91,9 +91,13 @@ class GlmMembersFront_registrations_cartLinkWidget
 
         // Compile template data
         $templateData = $cartData;
-        $templateData['haveCart'] = $haveCart;
-        $templateData['assetUrl'] = GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL;
-        $templateData['regUrl'] = GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/';
+        $templateData = array_merge( $cartData, array(
+            'haveCart' => $haveCart,
+            'assetUrl' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL,
+            'regUrl'   => GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/',
+            'page'     => 'registration',
+            'loggedIn' => ( isset( $_SESSION['LoginAccount'] ) ) ? $_SESSION['LoginAccount']: false,
+        ) );
 
         // echo "<pre>".print_r($templateData,1)."</pre>";
         if($viewAttr){

diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php
index 7dd2a36..6df0f3d 100644 (file)
--- a/models/front/registrations/registration.php
+++ b/models/front/registrations/registration.php
@@ -354,7 +354,6 @@
             'thisJsUrl'         => GLM_MEMBERS_REGISTRATIONS_PLUGIN_URL . '/js',
             'regEventJSON'      => json_encode( $event, JSON_NUMERIC_CHECK ),
             'regClassesJSON'    => $regClassJSON,
-            // 'regTimesJSON'      => $regTimesJSON,
             'regCartJSON'       => $regCartJSON,
             'imgBaseUrl'        => GLM_MEMBERS_PLUGIN_MEDIA_URL ."/images/",
             'regRequestJSON'    => $regRequestJSON,
@@ -367,8 +366,6 @@
             'reg_bulletin'      => $misc['reg_bulletin']
         );
 
-        // echo '<pre>$registrants: ' . print_r( $templateData, true ) . '</pre>';
-
         // Return status, any suggested view, and any data to controller
         return array(
             'status'        => true,

diff --git a/views/front/registrations/accountHeader.html b/views/front/registrations/accountHeader.html
index 96fc21d..4b46d1a 100644 (file)
--- a/views/front/registrations/accountHeader.html
+++ b/views/front/registrations/accountHeader.html
@@ -1,5 +1,5 @@
 <div id="accountHeader" class="row">
-    
+
     <div id="accountHeader-left" class="accountHeader-section small-12 medium-12 medium-centered large-5 large-uncentered columns">
         {if $page != 'register'}
             <a href="{$regUrl}" class="button tiny glm-reg-header-btn">
@@ -115,4 +115,4 @@ jQuery(document).ready(function($) {
         });
     });
 });
-</script>
\ No newline at end of file
+</script>

diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 9c8ff3f..fc3ad4f 100644 (file)
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -62,7 +62,7 @@
                             <div class="small-12 columns glm-reg-event-profile-details">
                                 <div id="glm-reg-detail-map-button" class="button map-button">View Map</div>
                                 <form id="MemberDrivingDirectionsForm" name="MemberDrivingDirectionsForm" method="post" action="">
-                                    <input type="hidden" id="MemberLocation" name="MemberLocation" value="{$member.member_name|escape}">
+                                    <input type="hidden" id="MemberLocation" name="MemberLocation" value="">
                                     <input type="hidden" id="MemberLat" name="MemberLat" value="{$regEvent.locations.lat}">
                                     <input type="hidden" id="MemberLon" name="MemberLon" value="{$regEvent.locations.lon}">
                                     <input type="submit" class="button map-button text-center glm-reg-detail-directions-button map-button" id="glm-reg-detail-directions-button" name="MemberDrivingDirectionSubmit" value="Directions">
@@ -111,7 +111,6 @@
             <div class="row glm-reg-event-details">
                 <span class="columns small-12 large-3 glm-reg-level-title glm-reg-level-info"><%= name %></span>
 
-<!--                <div class="columns small-12 large-2 glm-reg-level-info"> <%= reg_rate_name  %> </div>-->
                 <% if( reg_rate_base_price ){ %>
                     <div class="columns small-12 large-2 glm-reg-level-info"> Base Rate: $<%= reg_rate_base_price %> </div>
                 <% } %>
@@ -141,19 +140,12 @@
 
                 <% if ( app.timeSpecific ) { %>
                     <div class="glm-reg-warning show-for-medium-up">
-<!--                        Please select a Date / Time!
-                        <img src="{/literal}{$assetUrl}{literal}/fingerRightRed.svg" style="height: 2em;">-->
                     </div>
                     <div class="glm-reg-warning show-for-small-only">
-<!--                        Please select a Date / Time!
-                        <img src="{/literal}{$assetUrl}{literal}/fingerDownRed.svg" style="height: 2em;">-->
                     </div>
                 <% } %>
             </div>
         </div>
-<!--        <div class="columns small-12 large-6">
-            <div id="eventCalendar-<%= id %>" style="width: 95%;"></div>
-        </div>-->
     </div>
 </script>
 {/literal}
@@ -214,7 +206,6 @@
                     <div class="columns large-8 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> -->
                     <input type="hidden" id="add_reg-select-time">
                 {/if}{literal}
             </div>
@@ -279,7 +270,6 @@
                 </div>
             {/literal}{if $regEvent.time_specific.value}
                 <div>
-                   <!-- Selected Time: <span id="reg-time-display-{literal}<%= id %>{/literal}">{literal}<%= reg_time_text %>{/literal}</span> -->
                     <input type="hidden" id="reg-time-{literal}<%= id %>{/literal}" value="{literal}<%- reg_time %>{/literal}">
                 </div>
             {/if}{literal}
@@ -293,7 +283,6 @@
 {/literal}
 <div id="glm-reg-detail">
     <h1>{$terms.reg_term_registrations_name}</h1>
-    <!-- {include file='front/registrations/header.html'} -->
     {apply_filters('glm_members_registrations_header', 'accountHeader')}
     <div class="row progress-row">
         <div class="progress-container columns">
@@ -436,7 +425,7 @@ jQuery(function($){
                     position: new google.maps.LatLng({$regEvent.locations.lat}, {$regEvent.locations.lon}),
                     draggable: false,
                     animation: google.maps.Animation.DROP,
-                    title: '{$member.member|escape}'
+                    title: ''
                 });
              {/if}