From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 11 Jul 2018 18:41:03 +0000 (-0400)
Subject: Add registered_by field to registrant export
X-Git-Tag: v1.0.10^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=92fe261f7e9b05343a76b9a6c8d8dea31396fc7a;p=WP-Plugins%2Fglm-member-db-registrations.git

Add registered_by field to registrant export

Adding registered_by field to export attendees.
---

diff --git a/classes/data/dataRegRequestRegistrant.php b/classes/data/dataRegRequestRegistrant.php
index 6eef86a..36c0d85 100644
--- a/classes/data/dataRegRequestRegistrant.php
+++ b/classes/data/dataRegRequestRegistrant.php
@@ -286,7 +286,19 @@ class GlmDataRegistrationsRequestRegistrant extends GlmDataAbstract
                     'p_static'  => true,
                 'required'  => true,
                 'use'       => 'lg'
-            )
+            ),
+
+            // Registered By
+            'registered_by' => array(
+                'field'     => 'reg_request',
+                'as'        => 'registered_by',
+                'type'      => 'pointer',
+                    'p_table'   => GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX . 'reg_request',
+                    'p_field'   => 'CONCAT_WS( \' \', bill_fname, bill_lname )',
+                    'p_static'  => true,
+                'required'  => false,
+                'use'       => 'lg'
+            ),
 
         );
 
diff --git a/models/admin/ajax/registrantsListExport.php b/models/admin/ajax/registrantsListExport.php
index 9daa145..a9e6198 100644
--- a/models/admin/ajax/registrantsListExport.php
+++ b/models/admin/ajax/registrantsListExport.php
@@ -101,21 +101,22 @@ class GlmMembersAdmin_ajax_registrantsListExport extends GlmDataRegistrationsReq
 
         // Check selected fields
         $select = array(
-            'exportId'         => $this->checkFlag('exportId'),
-            'exportRegistrant' => $this->checkFlag('exportRegistrant'),
-            'exportAddr1'      => $this->checkFlag('exportAddr1'),
-            'exportAddr2'      => $this->checkFlag('exportAddr2'),
-            'exportCity'       => $this->checkFlag('exportCity'),
-            'exportState'      => $this->checkFlag('exportState'),
-            'exportZip'        => $this->checkFlag('exportZip'),
-            'exportEmail'      => $this->checkFlag('exportEmail'),
-            'exportPhone'      => $this->checkFlag('exportPhone'),
-            'exportCounty'     => $this->checkFlag('exportCounty'),
-            'exportLevel'      => $this->checkFlag('exportLevel'),
-            'exportTime'       => $this->checkFlag('exportTime'),
-            'exportRate'       => $this->checkFlag('exportRate'),
-            'exportStatus'     => $this->checkFlag('exportStatus'),
-            'exportCustom'     => $this->checkFlag('exportCustom'),
+            'exportId'           => $this->checkFlag('exportId'),
+            'exportRegistrant'   => $this->checkFlag('exportRegistrant'),
+            'exportAddr1'        => $this->checkFlag('exportAddr1'),
+            'exportAddr2'        => $this->checkFlag('exportAddr2'),
+            'exportCity'         => $this->checkFlag('exportCity'),
+            'exportState'        => $this->checkFlag('exportState'),
+            'exportZip'          => $this->checkFlag('exportZip'),
+            'exportEmail'        => $this->checkFlag('exportEmail'),
+            'exportPhone'        => $this->checkFlag('exportPhone'),
+            'exportCounty'       => $this->checkFlag('exportCounty'),
+            'exportLevel'        => $this->checkFlag('exportLevel'),
+            'exportTime'         => $this->checkFlag('exportTime'),
+            'exportRate'         => $this->checkFlag('exportRate'),
+            'exportStatus'       => $this->checkFlag('exportStatus'),
+            'exportRegisteredBy' => $this->checkFlag('exportRegisteredBy'),
+            'exportCustom'       => $this->checkFlag('exportCustom'),
         );
 
         // Get registration event ID if supplied
diff --git a/views/admin/ajax/registrantsListExport.html b/views/admin/ajax/registrantsListExport.html
index b1d7a40..0fcbb1c 100644
--- a/views/admin/ajax/registrantsListExport.html
+++ b/views/admin/ajax/registrantsListExport.html
@@ -25,6 +25,7 @@
                     {if $select.exportTime}<th align="left">Date/Time</th>{/if}
                     {if $select.exportRate}<th align="left">Rate</th>{/if}
                     {if $select.exportStatus}<th align="left">Status</th>{/if}
+                    {if $select.exportRegisteredBy}<th align="left">Registered By</th>{/if}
                     {if $select.exportCustom && $customFieldHeaders}
                         {foreach $customFieldHeaders as $header}
                             <th align="left">{$header}</th>
@@ -50,6 +51,7 @@
                     {if $select.exportTime}<td>{$m.event_time_reformatted}</td>{/if}
                     {if $select.exportRate}<td>{$m.rate_name}</td>{/if}
                     {if $select.exportStatus}<td>{$m.request_status_name}</td>{/if}
+                    {if $select.exportRegisteredBy}<td>{$m.registered_by}</td>{/if}
                     {if $select.exportCustom && $customFieldHeaders}
                         {foreach $m.custom_data as $cData}
                             <td>{$cData}</td>
diff --git a/views/admin/ajax/registrantsListExportCsv.html b/views/admin/ajax/registrantsListExportCsv.html
index ee622bc..0cac653 100644
--- a/views/admin/ajax/registrantsListExportCsv.html
+++ b/views/admin/ajax/registrantsListExportCsv.html
@@ -11,7 +11,8 @@
 {if $select.exportLevel}"Level",{/if}
 {if $select.exportTime}"Date/Time",{/if}
 {if $select.exportRate}"Rate",{/if}
-{if $select.exportStatus}"Status"{/if}
+{if $select.exportStatus}"Status",{/if}
+{if $select.exportRegisteredBy}"Registered By"{/if}
 {if $select.exportCustom && $customFieldHeaders}{foreach $customFieldHeaders as $header},"{$header}"{/foreach}{/if}
 
 {foreach $registrants as $m}
@@ -27,7 +28,8 @@
 {if $select.exportLevel}"{$m.class_name}",{/if}
 {if $select.exportTime}"{$m.event_time_reformatted}",{/if}
 {if $select.exportRate}"{$m.rate_name}",{/if}
-{if $select.exportStatus}"{$m.request_status_name}"{/if}
+{if $select.exportStatus}"{$m.request_status_name}",{/if}
+{if $select.exportRegisteredBy}"{$m.registered_by}"{/if}
 {if $select.exportCustom && $customFieldHeaders}{foreach $m.custom_data as $cData},"{$cData}"{/foreach}{/if}
 
 {/foreach}
diff --git a/views/admin/registrations/eventRegistrants.html b/views/admin/registrations/eventRegistrants.html
index 8ca322a..d1c680d 100644
--- a/views/admin/registrations/eventRegistrants.html
+++ b/views/admin/registrations/eventRegistrants.html
@@ -177,7 +177,7 @@
         <input type="hidden" name="glm_action" value="registrantsListExport">
         <input type="hidden" name="regEventID" value="{$regEvent.id}">
         <table class="glm-admin-table">
-        
+
             <tr>
                 <th>Name Search:</th>
                 <td><input type="text" name="text_search" value=""></td>
@@ -188,7 +188,7 @@
                     <table padding="3">
                         <tr>
                             <td class="exportFieldsTd">
-                                <a id="selectAllStatusFields" class="button button-secondary button-small">Check All</a> <a class="button button-secondary button-small" id="unselectAllStatusFields">Uncheck All</a> Please select at least one.<br> 
+                                <a id="selectAllStatusFields" class="button button-secondary button-small">Check All</a> <a class="button button-secondary button-small" id="unselectAllStatusFields">Uncheck All</a> Please select at least one.<br>
                 {foreach from=$submitStatus key=status_id item=status_name}
                                 <input class="statusCheckbox" type="checkbox" name="status[{$status_id}]"> {$status_name}<br>
                 {/foreach}
@@ -213,6 +213,7 @@
                                 <input class="exportField" type="checkbox" name="exportCity" checked> City<br>
                                 <input class="exportField" type="checkbox" name="exportState" checked> State<br>
                                 <input class="exportField" type="checkbox" name="exportZip" checked> ZIP/Postal Code<br>
+                                <input class="exportField" type="checkbox" name="exportRegisteredBy" checked> Registered By<br>
                             </td>
                             <td class="exportFieldsTd">
                                 <input class="exportField" type="checkbox" name="exportEmail" checked> Email <br>
@@ -253,7 +254,7 @@ jQuery(document).ready(function($){
             return false;
         }
     });
-    
+
     // Setup the Export Registrant Dialog
     var dialog = $('#exportRegistrantsDialog').dialog({
         autoOpen: false,