From 5c1c42f4ee19236d08f17135924bf0c80d1e4875 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 3 Sep 2019 08:43:05 -0400
Subject: [PATCH] Bug fix for getting settings.

config['settings'] is the proper way.
---
 classes/billingSupport.php | 24 +++++++++++++-----------
 index.php                  |  6 +++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/classes/billingSupport.php b/classes/billingSupport.php
index 83bb600..edf56df 100644
--- a/classes/billingSupport.php
+++ b/classes/billingSupport.php
@@ -1536,8 +1536,8 @@ class GlmBillingSupport
      */
     public function updateAccountRenewalDate( $account )
     {
-        $days_after_expired  = $this->config['days_after_expired'];
-        $days_before_renewal = $this->config['days_before_renewal'];
+        $days_after_expired  = $this->config['settings']['days_after_expired'];
+        $days_before_renewal = $this->config['settings']['days_before_renewal'];
         // Grab current renewal date
         $current_renewal_date = $this->wpdb->get_var(
             $this->wpdb->prepare(
@@ -1551,15 +1551,17 @@ class GlmBillingSupport
             $renewal_date = new DateTime( $current_renewal_date );
             // Get earliest date this one can renewal with.
             $earliest_date = $renewal_date->modify( '-' . $days_before_renewal . ' days + 1 year' );
-        }
-        $year_part = substr( $current_renewal_date, 0, 4 );
-        $the_rest  = substr( $current_renewal_date, 4 );
-        // Adjust the year to current year
-        $new_renewal_date = date( 'Y' ) . $the_rest;
-        $test_renewal_date = new DateTime( $new_renewal_date );
-        if ( $test_renewal_date->getTimestamp() < $earliest_date->getTimestamp() ) {
-            // Adjust the year.
-            $new_renewal_date = ( date( 'Y' ) - 1 ) . $the_rest;
+            $year_part = substr( $current_renewal_date, 0, 4 );
+            $the_rest  = substr( $current_renewal_date, 4 );
+            // Adjust the year to current year
+            $new_renewal_date = date( 'Y' ) . $the_rest;
+            $test_renewal_date = new DateTime( $new_renewal_date );
+            if ( $test_renewal_date->getTimestamp() < $earliest_date->getTimestamp() ) {
+                // Adjust the year.
+                $new_renewal_date = ( date( 'Y' ) - 1 ) . $the_rest;
+            }
+        } else {
+            $new_renewal_date = date( 'Y-m-d' );
         }
 
         $this->wpdb->update(
diff --git a/index.php b/index.php
index 347a6a4..05ae478 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.35
+ * Version: 1.0.36
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersBillingAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.0.35
+ * @version 1.0.36
  */
 
 /*
@@ -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.35');
+define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '1.0.36');
 
 // Database Version
 define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.26');
-- 
2.17.1