Update for billing

pending or overdue should not include the free ones.

diff --git a/models/admin/billing/index.php b/models/admin/billing/index.php
index 599c829..d8ae1bc 100644 (file)
--- 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 );