From c47c871293f748c489263e1e9c4cd9a9531aaeb9 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 17 Oct 2017 15:40:52 -0400
Subject: [PATCH] Fix for the registrants output in account dashboard.

Setup event data so we can output the event name.
event_name field was removed from the immediate table.
---
 models/admin/registrations/accounts.php         | 12 ++++++++++--
 views/admin/registrations/accountDashboard.html | 14 ++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/models/admin/registrations/accounts.php b/models/admin/registrations/accounts.php
index 29d5958..17cb1af 100644
--- a/models/admin/registrations/accounts.php
+++ b/models/admin/registrations/accounts.php
@@ -196,6 +196,8 @@ class GlmMembersAdmin_registrations_accounts extends GlmDataRegistrationsAccount
             $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config);
             require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/data/dataRegRequestRegistrant.php';
             $RegRequestRegistrant = new GlmDataRegistrationsRequestRegistrant($this->wpdb, $this->config);
+            require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH .  '/data/dataRegRequestEvent.php';
+            $RegRequestEvent = new GlmDataRegistrationsRequestEvent( $this->wpdb, $this->config );
 
             // Get account base data
             $account = $this->getEntry($accountID);
@@ -213,6 +215,12 @@ class GlmMembersAdmin_registrations_accounts extends GlmDataRegistrationsAccount
                 $registered = $RegRequestRegistrant->getList("T.account = $accountID");
                 if (is_array($registered) && count($registered) > 0) {
                     $haveRegistered = true;
+
+                    // Loop through the registered array and get event names.
+                    foreach ( $registered as $key => $reg ) {
+                        $registered[$key]['eventData'] = $RegRequestEvent->getEntry( $reg['reg_request_event'] );
+                    }
+                    echo '<pre>$registered: ' . print_r( $registered, true ) . '</pre>';
                 }
 
             }
@@ -263,10 +271,10 @@ class GlmMembersAdmin_registrations_accounts extends GlmDataRegistrationsAccount
             }
 
             $accountsResult = $this->getList( $where, 'lname', true, 'id', $start, $limit  );
-            //echo '<pre>$accountsResult: ' . print_r( $accountsResult, true ) . '</pre>';
+            // echo '<pre>$accountsResult: ' . print_r( $accountsResult, true ) . '</pre>';
 
             //$accounts    = $this->getList( $where );
-            //echo '<pre>$where: ' . print_r( $where, true ) . '</pre>';
+            // echo '<pre>$where: ' . print_r( $where, true ) . '</pre>';
 
             // Get paging results
             $numbDisplayed = $accountsResult['returned'];
diff --git a/views/admin/registrations/accountDashboard.html b/views/admin/registrations/accountDashboard.html
index fa8e85b..643ba03 100644
--- a/views/admin/registrations/accountDashboard.html
+++ b/views/admin/registrations/accountDashboard.html
@@ -3,10 +3,10 @@
 <h1>Selected Account Dashboard</h1>
 
 <div class="glm-admin-table-inner glm-admin-table">
-    
+
     <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=edit&account={$accountID}" class="button button-secondary glm-button glm-right">Edit Account</a>
     <h3>Account</h3>
-    
+
     <div id="glm-admin-member-registrations-account-detail" class="glm-admin-table">
         <div class="glm-row">
             <div class="glm-small-4 glm-left">
@@ -93,7 +93,7 @@
             </tr>
         {/foreach}
         </table>
-        
+
 </div>
 
 <div class="glm-admin-table-inner glm-admin-table">
@@ -114,14 +114,16 @@
             <tr class="alternate">
         {/if}
             <td>
-                <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=eventDashboard&regEventID={$req.id}">
-                {$reg.event_name}
+                <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-events&option=eventDashboard&regEventID={$reg.reg_event}">
+                    {$reg.eventData.event_name}
+                </a>
+
             </td>
             <td>{$reg.event_datetime.datetime}</td>
         </tr>
     {/foreach}
     </table>
-</div>    
+</div>
 
 
 {include file='admin/footer.html'}
-- 
2.17.1