From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 10 Jul 2018 15:00:33 +0000 (-0400)
Subject: Use complete filter same as the list is.
X-Git-Tag: v1.0.9^2~4
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=314f8d887a57559097a044be7163d245b56785d0;p=WP-Plugins%2Fglm-member-db-registrations.git

Use complete filter same as the list is.

Updating the export file to use the same query part for the complete
filter.
---

diff --git a/models/admin/ajax/registrantsListExport.php b/models/admin/ajax/registrantsListExport.php
index 6a27a1b..6cb0b16 100644
--- a/models/admin/ajax/registrantsListExport.php
+++ b/models/admin/ajax/registrantsListExport.php
@@ -140,10 +140,24 @@ class GlmMembersAdmin_ajax_registrantsListExport extends GlmDataRegistrationsReq
         // Filter for complete if given
         if ( isset( $_REQUEST['complete'] ) && filter_var( $_REQUEST['complete'], FILTER_VALIDATE_BOOLEAN) ) {
             $completed = true;
-            $whereParts[] = "T.reg_request in (
-            SELECT id
-              FROM " . GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX .  "reg_request
-             WHERE status = {$this->config['submission_status_numb']['COMPLETE']})";
+            // $whereParts[] = "T.reg_request in (
+            // SELECT id
+            //   FROM " . GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX .  "reg_request
+            //  WHERE status = {$this->config['submission_status_numb']['COMPLETE']})";
+
+            $whereParts[] = "
+                (
+                SELECT count(id)
+                  FROM " . GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_PREFIX .  "reg_request
+                 WHERE id = T.reg_request
+                   AND status NOT IN
+                        (
+                        {$this->config['submission_status_numb']['CART']},
+                        {$this->config['submission_status_numb']['FAILED']},
+                        {$this->config['submission_status_numb']['CANCELED']}
+                        )
+                ) > 0
+            ";
         }
 
         // Check for a text search
diff --git a/views/admin/registrations/eventRegistrants.html b/views/admin/registrations/eventRegistrants.html
index ec9bc3a..d8324a8 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>Show Only Completed:</th><td><input type="checkbox" name="complete" value="1"></td></tr>
+            <tr><td colspan="2"><label><input type="checkbox" name="complete" value="1" checked>Don't show attendees in pending or invalid carts</label></td></tr>
             <tr>
                 <th>Name Search:</th>
                 <td><input type="text" name="text_search" value=""></td>