From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 Oct 2017 20:46:43 +0000 (-0400)
Subject: Correcting name for the registrant when adding it to cart.
X-Git-Tag: v1.0.0^2~355
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=cd23576137355db2696c0643e43baf8d46fdfaf7;p=WP-Plugins%2Fglm-member-db-registrations.git

Correcting name for the registrant when adding it to cart.

Using registrant now for the variable.
---

diff --git a/js/frontRegApp.js b/js/frontRegApp.js
index 2c2a11a..cf1f00b 100644
--- a/js/frontRegApp.js
+++ b/js/frontRegApp.js
@@ -826,8 +826,9 @@ app.Views.Front.RegClass = Backbone.View.extend({
         this.newRegAccount     = new app.Models.Front.RegRequestRegistrant();
         this.newRegAccountView = new app.Views.Front.RegistrantForm({model: this.newRegAccount});
         this.$el.append( this.newRegAccountView.render().el );
-        if ( app.timeSpecific === true ) {
+        if ( app.timeSpecific ) {
             app.initFullCalendar();
+            console.log('called app.initFullCalendar()');
         }
     },
 
diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js
index 1f9e1e7..920f1f3 100644
--- a/js/views/front/regClass.js
+++ b/js/views/front/regClass.js
@@ -138,8 +138,9 @@ app.Views.Front.RegClass = Backbone.View.extend({
         this.newRegAccount     = new app.Models.Front.RegRequestRegistrant();
         this.newRegAccountView = new app.Views.Front.RegistrantForm({model: this.newRegAccount});
         this.$el.append( this.newRegAccountView.render().el );
-        if ( app.timeSpecific === true ) {
+        if ( app.timeSpecific ) {
             app.initFullCalendar();
+            console.log('called app.initFullCalendar()');
         }
     },
 
diff --git a/models/admin/ajax/regFront/registrant.php b/models/admin/ajax/regFront/registrant.php
index 11d6f5f..300bff1 100644
--- a/models/admin/ajax/regFront/registrant.php
+++ b/models/admin/ajax/regFront/registrant.php
@@ -81,6 +81,7 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
     public function modelAction($modelData)
     {
 
+        $validated = false;
         trigger_error(print_r($modelData,1));
 
         if ( !isset( $modelData['option'] ) ) {
@@ -283,7 +284,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
                 // Here validated would be false.
                 // Because it is new account.
             }
-            $validated = false;
             $validated = $this->wpdb->get_var(
                 $this->wpdb->prepare(
                     "SELECT validated
@@ -380,9 +380,20 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
                     array( '%d' )
                 );
             }
-            $regRequstRegistrant = $this->getEntry( $regRequestRegistrantId );
-            $regRequestRegistrant['validated'] = $validated;
-            echo json_encode( $regRequstRegistrant, JSON_NUMERIC_CHECK );
+            $registrant = $this->getEntry( $regRequestRegistrantId );
+            $registrant['validated'] = $validated;
+            if ( $registrant['reg_time'] && filter_var( $registrant['reg_time'], FILTER_VALIDATE_INT ) ) {
+                $regTimeText = $this->wpdb->get_var(
+                    $this->wpdb->prepare(
+                        "SELECT DATE_FORMAT( start_datetime, '%%m/%%d/%%Y %%l:%%i %%p' )
+                           FROM " .  GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . "reg_time
+                          WHERE id = %d",
+                        $registrant['reg_time']
+                    )
+                );
+                $registrant['reg_time_text'] = $regTimeText;
+            }
+            echo json_encode( $registrant, JSON_NUMERIC_CHECK );
             wp_die();
             break;
 
@@ -390,7 +401,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
             break;
 
         case 'update':
-            $validated = false;
             if ( $accountId = filter_var( $modelData['account'], FILTER_VALIDATE_INT ) ) {
                 $validated = $this->wpdb->get_var(
                     $this->wpdb->prepare(
@@ -468,9 +478,20 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations
                     $dataFormat,
                     array( '%d' )
                 );
-                $regRequstRegistrant = $this->getEntry( $regRequestRegistrantId );
-                $regRequestRegistrant['validated'] = $validated;
-                echo json_encode( $regRequstRegistrant, JSON_NUMERIC_CHECK );
+                $registrant = $this->getEntry( $regRequestRegistrantId );
+                $registrant['validated'] = $validated;
+                if ( $registrant['reg_time'] && filter_var( $registrant['reg_time'], FILTER_VALIDATE_INT ) ) {
+                    $regTimeText = $this->wpdb->get_var(
+                        $this->wpdb->prepare(
+                            "SELECT DATE_FORMAT( start_datetime, '%%m/%%d/%%Y %%l:%%i %%p' )
+                               FROM " .  GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . "reg_time
+                              WHERE id = %d",
+                            $registrant['reg_time']
+                        )
+                    );
+                    $registrant['reg_time_text'] = $regTimeText;
+                }
+                echo json_encode( $registrant, JSON_NUMERIC_CHECK );
                 wp_die();
             }
             break;
diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php
index aa9a084..821932a 100644
--- a/models/front/registrations/registration.php
+++ b/models/front/registrations/registration.php
@@ -265,7 +265,6 @@
                                                     $registrant['reg_time']
                                                 )
                                             );
-                                            // var_dump( $regTimeText );
                                             $registrant['reg_time_text'] = $regTimeText;
                                         }
                                         $registrant['class_id']  = $classId;
diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index c007a3c..c9dbcc8 100644
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -162,11 +162,11 @@
 {/literal}
 {* Template for registrant *}{literal}
 <script type="text/template" id="registrant-template">
-    <a class="glm-reg-level-registrant-delete">Delete</a>
+<a class="glm-reg-level-registrant-delete" title="Delete"><span class="dashicons dashicons-trash"></span></a>
     <% if ( validated ) { %>
         <span class="glm-registrant-noedit"><%= fname %> <%= lname %> <%= email %></span>
     <% } else { %>
-        <span class="glm-registrant-edit"><%= fname %> <%= lname %> <%= email %></span>
+        <div class="glm-registrant-edit" title="Edit"><%= fname %> <%= lname %> <%= email %><span class="dashicons dashicons-edit"></span></div>
         <div class="reg-edit-form">
             {/literal}{if $regEvent.time_specific.value}
                 <div style="float: right; width: 48%;">
@@ -241,7 +241,7 @@ var app = {
     {if $regEvent.time_specific.value}
     initFullCalendar: function(){
         if ({$regEvent.time_specific.value}) {
-            app.FullCalendar = $('#eventCalendar').fullCalendar({
+            $('#eventCalendar').fullCalendar({
                 {if $regEvent}
                     events: [
                         {$sep = ''}