From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 3 Jan 2019 20:53:02 +0000 (-0500)
Subject: Merge branch 'develop' into feature/uptravel
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0ca0f5784ed98fd2df1c9593c8902535b10f0447;p=WP-Plugins%2Fglm-member-db-billing.git

Merge branch 'develop' into feature/uptravel
---

0ca0f5784ed98fd2df1c9593c8902535b10f0447
diff --cc index.php
index 2d2ad0c,3ca41e7..c0fe56a
--- a/index.php
+++ b/index.php
@@@ -37,8 -37,8 +37,8 @@@
   *  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.16');
+ define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '1.0.20');
 -define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.26');
 +define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.32');
  
  // This is the minimum version of the GLM Members DB plugin require for this plugin.
  define('GLM_MEMBERS_BILLING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0');
diff --cc models/admin/member/billing.php
index 2a6a21d,b65218f..b4ada42
--- a/models/admin/member/billing.php
+++ b/models/admin/member/billing.php
@@@ -790,7 -756,7 +791,8 @@@ class GlmMembersAdmin_member_billing /
              'account_status'     => $account_status,
              'accounts'           => $accounts,
              'invoiceTypes'       => $invoiceTypes,
 +            'paymentMethods'     => $this->config['alt_payment_method']
+             'renewalFormSession' => $renewalFormSession,
          );
  
          // Return status, any suggested view, and any data to controller.