From ee65137021b3484df4e781cd9bbaaf58a25ef5f9 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 31 Aug 2018 14:07:06 -0400
Subject: [PATCH] Update to remove free memberships from pending overdue or
 expired

Free membership don't expire.
---
 models/admin/billing/accounts.php | 3 +++
 models/admin/billing/index.php    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/models/admin/billing/accounts.php b/models/admin/billing/accounts.php
index 9b53dc7..3eb0fb8 100644
--- a/models/admin/billing/accounts.php
+++ b/models/admin/billing/accounts.php
@@ -397,6 +397,7 @@ class GlmMembersAdmin_billing_accounts extends GlmDataAccounts
                 // $where_params[] = "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY >= '$curDate'";
                 $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";
             }
             if ( isset( $_REQUEST['filterOverdue'] ) ) {
                 $filterOverdue = filter_var( $_REQUEST['filterOverdue'], FILTER_VALIDATE_BOOLEAN );
@@ -404,11 +405,13 @@ class GlmMembersAdmin_billing_accounts extends GlmDataAccounts
                 // $where_params[] = "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY >= '$curDate'";
                 $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 );
                 // $where_params[] = "T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY < '$curDate'";
                 $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 ) ) {
diff --git a/models/admin/billing/index.php b/models/admin/billing/index.php
index d8ae1bc..28d7f8c 100644
--- a/models/admin/billing/index.php
+++ b/models/admin/billing/index.php
@@ -247,7 +247,7 @@ class GlmMembersAdmin_billing_index extends GlmDataAccounts
             $days_after_expired  = $this->config['settings']['days_after_expired'];
             $orderBy = 'renewal_date ASC';
             $curDate = date( 'Y-m-d' );
-            $pendingWhere = "T.archived <> true AND invoice_type <> 0 ";
+            $pendingWhere = "T.archived <> true AND invoice_type != 0 ";
             $pendingWhere .= " AND T.renewal_date + INTERVAL 1 YEAR - INTERVAL $days_before_renewal DAY  <= '$curDate'" ;
             $pendingWhere .= " AND T.renewal_date + INTERVAL 1 YEAR + INTERVAL $days_after_expired DAY >= '$curDate'";
             $start        = 1;
@@ -256,7 +256,7 @@ class GlmMembersAdmin_billing_index extends GlmDataAccounts
             $numberPending = ( isset( $pending['returned'] ) ? $pending['returned'] : 0 );
 
             // Get the number of over due invoices
-            $overDueWhere  = "T.archived <> true AND invoice_type <> 0";
+            $overDueWhere  = "T.archived <> true AND invoice_type != 0";
             $overDueWhere .= " AND T.renewal_date + INTERVAL 1 YEAR < '$curDate'";
             $start         = 1;
             $overdue       = $this->getList( $overDueWhere, $orderBy, true, 'id', $start, $limit );
-- 
2.17.1