From 5ab2003cd704a86a93aa9af19ac7eef2438b3e1e Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 31 Aug 2018 14:00:26 -0400 Subject: [PATCH] Update for billing pending or overdue should not include the free ones. --- models/admin/billing/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/admin/billing/index.php b/models/admin/billing/index.php index 599c829..d8ae1bc 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 "; + $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"; + $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