From a1a4a57a036be92405e7beafbf6c082f1b6701ba Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 1 Apr 2019 16:46:56 -0400
Subject: [PATCH] Export reports complete

Should only show button on report generator page.
---
 models/admin/ajax/reportsListExport.php    |  4 ++--
 models/admin/billing/reports.php           |  2 +-
 views/admin/billing/exportReportModal.html | 13 +++++++++++--
 views/admin/billing/reports.html           | 10 +++++++---
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/models/admin/ajax/reportsListExport.php b/models/admin/ajax/reportsListExport.php
index 2715f39..1e8c615 100644
--- a/models/admin/ajax/reportsListExport.php
+++ b/models/admin/ajax/reportsListExport.php
@@ -179,10 +179,10 @@ class GlmMembersAdmin_ajax_reportsListExport extends GlmDataTransactions
         $where = implode( ' AND ', $where_params );
 
         // Get a current list of accounts without paging
-        $orderBy = 'transaction_time ASC';
+        $orderBy           = 'transaction_time ASC';
         $this->member_data = true;
         $this->notes       = true;
-        $list    = $this->getList( $where, $orderBy, true );
+        $list              = $this->getList( $where, $orderBy, true );
 
         // If we have list entries - even if it's an empty list
         $success      = true;
diff --git a/models/admin/billing/reports.php b/models/admin/billing/reports.php
index d092f01..c7e4feb 100644
--- a/models/admin/billing/reports.php
+++ b/models/admin/billing/reports.php
@@ -206,7 +206,7 @@ class GlmMembersAdmin_billing_reports extends GlmDataTransactions
 
         case 'reportGenerator':
             // Check if Counties is enabled and fetch counties
-            if ( isset( $this->config['settings']['enable_counties'] ) && $this->config['settings']['enable_counties'] ) {
+            if ( isset( $this->config['settings']['billing_county_enabled'] ) && $this->config['settings']['billing_county_enabled'] ) {
                 // Grab counties
                 $counties = $this->wpdb->get_results(
                     "SELECT *
diff --git a/views/admin/billing/exportReportModal.html b/views/admin/billing/exportReportModal.html
index 6c26944..e4047c6 100644
--- a/views/admin/billing/exportReportModal.html
+++ b/views/admin/billing/exportReportModal.html
@@ -47,10 +47,19 @@
             <tr>
                 <th>Name Search:</th>
                 <td>
-                    <input id="member-account2" type="hidden" name="filterReports" value="{$filterReports}">
-                    <input id="account_name2" name="searchName" value="{if $searchName}{$searchName}{/if}" />
+                    <input type="hidden" name="filterReports" value="{$filterReports}">
+                    <input id="account_name2" name="member_name" value="" />
                 </td>
             </tr>
+            {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled}
+                <tr>
+                    <th>Account Number Search:</th>
+                    <td>
+                        <input type="hidden" name="filterReports" value="{$filterReports}">
+                        <input id="account_number" name="account_number" value="" />
+                    </td>
+                </tr>
+            {/if}
             <tr>
                 <th>Fields to export: </th>
                 <td>
diff --git a/views/admin/billing/reports.html b/views/admin/billing/reports.html
index 05acae7..826343e 100644
--- a/views/admin/billing/reports.html
+++ b/views/admin/billing/reports.html
@@ -2,7 +2,9 @@
 <h2>Invoicing</h2>
 {include file='admin/billing/reportsSubHeader.html'}
 
-<div id="exportReportsButton" class="button button-secondary glm-admin-export-button">Report Export</div>
+{if $option == 'reportGenerator'}
+    <div id="exportReportsButton" class="button button-secondary glm-admin-export-button">Report Export</div>
+{/if}
 
 <form id="reports-form" action="{$thisUrl}?page={$thisPage}" method="get">
     <input type="hidden" name="page" value="{$thisPage}">
@@ -36,8 +38,10 @@
             <div class="billing-search-form-container">
                 <label for="member_name">Member Name:</label>
                 <input class="reportForm" id="member_name" name="member_name" value="{if isset($smarty.request.member_name)}{$smarty.request.member_name}{/if}" />
-                <label for="account_number">Account Number:</label>
-                <input class="reportForm" id="account_number" name="account_number" value="{if isset($smarty.request.account_number)}{$smarty.request.account_number}{/if}" />
+                {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled}
+                    <label for="account_number">Account Number:</label>
+                    <input class="reportForm" id="account_number" name="account_number" value="{if isset($smarty.request.account_number)}{$smarty.request.account_number}{/if}" />
+                {/if}
                 <label>From:</label>
                 <input id="from_date" class="reportForm glm-date-input" name="from_date" value="{if isset($smarty.request.from_date)}{$smarty.request.from_date}{/if}" />
                 <label>To:</label>
-- 
2.17.1