From e14e80abf396e727a33b75afe313be4c99f205e8 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Sat, 1 Sep 2018 05:28:52 -0400 Subject: [PATCH] Update also the export file to remove free memberships Don't include ones with invioce_type is 0 --- models/admin/ajax/accountsListExport.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/models/admin/ajax/accountsListExport.php b/models/admin/ajax/accountsListExport.php index fa90508..89423fa 100644 --- a/models/admin/ajax/accountsListExport.php +++ b/models/admin/ajax/accountsListExport.php @@ -169,6 +169,7 @@ class GlmMembersAdmin_ajax_accountsListExport extends GlmDataAccounts $filterPending = filter_var( $_REQUEST['filterPending'], FILTER_VALIDATE_BOOLEAN ); $sub_where_parts[] = "(T.renewal_date + INTERVAL 1 YEAR - INTERVAL $days_before_renewal DAY <= '$curDate' AND " . "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY >= '$curDate')"; + $sub_where_parts[] = "Invoice_type != 0"; $filterPending = true; $haveFilter = true; } @@ -176,10 +177,12 @@ class GlmMembersAdmin_ajax_accountsListExport extends GlmDataAccounts $filterOverdue = filter_var( $_REQUEST['filterOverdue'], FILTER_VALIDATE_BOOLEAN ); $sub_where_parts[] = "(T.renewal_date + INTERVAL 1 YEAR < '$curDate' AND " . "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY >= '$curDate')"; + $sub_where_parts[] = "Invoice_type != 0"; } if ( isset( $_REQUEST['filterExpired'] ) ) { $filterExpired = filter_var( $_REQUEST['filterExpired'], FILTER_VALIDATE_BOOLEAN ); $sub_where_parts[] = "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY < '$curDate'"; + $sub_where_parts[] = "Invoice_type != 0"; } if ( !empty( $sub_where_parts ) ) { -- 2.17.1