From: Steve Sutton Date: Fri, 16 Nov 2018 20:55:54 +0000 (-0500) Subject: case for invoice_type X-Git-Tag: v1.0.15^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=4ac996a003486770247a15b176756c34719ecda7;p=WP-Plugins%2Fglm-member-db-billing.git case for invoice_type wasn't effecting the query though. --- diff --git a/index.php b/index.php index 6fabc96..153ced7 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Members Billing * Plugin URI: http://www.gaslightmedia.com/ * Description: This is glmAssociate Billing Module - * Version: 1.0.14 + * Version: 1.0.15 * Author: Gaslight Media * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -19,7 +19,7 @@ * @package glmMembersBillingAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.0.14 + * @version 1.0.15 */ /* @@ -37,7 +37,7 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '1.0.14'); +define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '1.0.15'); define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.26'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/models/admin/billing/accounts.php b/models/admin/billing/accounts.php index f98cca0..31bd15e 100644 --- a/models/admin/billing/accounts.php +++ b/models/admin/billing/accounts.php @@ -397,7 +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"; + $sub_where_parts[] = "invoice_type != 0"; } if ( isset( $_REQUEST['filterOverdue'] ) ) { $filterOverdue = filter_var( $_REQUEST['filterOverdue'], FILTER_VALIDATE_BOOLEAN ); @@ -405,13 +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"; + $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"; + $sub_where_parts[] = "invoice_type != 0"; } if ( !empty( $sub_where_parts ) ) {