From 5a6488544ce8cd6223eb48790facbb8be92f45ee Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 28 Mar 2018 10:11:38 -0400
Subject: [PATCH] More database updates

Change the field name from days to create invoice to days to allow
renewal.
Add one for days after renewal to expire membership.
---
 classes/data/dataSettings.php                 | 13 ++++++--
 index.php                                     |  2 +-
 ...0.0.15.sql => create_database_V0.0.16.sql} |  3 +-
 setup/databaseScripts/dbVersions.php          |  1 +
 .../update_database_V0.0.16.sql               | 14 ++++++++
 views/admin/settings/billing.html             | 32 +++++++++++++++----
 6 files changed, 53 insertions(+), 12 deletions(-)
 rename setup/databaseScripts/{create_database_V0.0.15.sql => create_database_V0.0.16.sql} (98%)
 create mode 100644 setup/databaseScripts/update_database_V0.0.16.sql

diff --git a/classes/data/dataSettings.php b/classes/data/dataSettings.php
index b02ac72..124ab2c 100644
--- a/classes/data/dataSettings.php
+++ b/classes/data/dataSettings.php
@@ -209,9 +209,16 @@ class GlmDataBillingSettings extends GlmDataAbstract
                 'use'   => 'a',
             ),
 
-            // Days Before Create Invoice
-            'days_before_create_invoice' => array(
-                'field' => 'days_before_create_invoice',
+            // Days Before Renewal Allowed
+            'days_before_renewal' => array(
+                'field' => 'days_before_renewal',
+                'type'  => 'integer',
+                'use'   => 'a',
+            ),
+
+            // Days After Expired
+            'days_after_expired' => array(
+                'field' => 'days_after_expired',
                 'type'  => 'integer',
                 'use'   => 'a',
             ),
diff --git a/index.php b/index.php
index fa9f4dd..f831a1f 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '0.0.1');
-define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.15');
+define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.16');
 
 // 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 --git a/setup/databaseScripts/create_database_V0.0.15.sql b/setup/databaseScripts/create_database_V0.0.16.sql
similarity index 98%
rename from setup/databaseScripts/create_database_V0.0.15.sql
rename to setup/databaseScripts/create_database_V0.0.16.sql
index 18a65fb..6feec67 100644
--- a/setup/databaseScripts/create_database_V0.0.15.sql
+++ b/setup/databaseScripts/create_database_V0.0.16.sql
@@ -216,7 +216,8 @@ CREATE TABLE {prefix}settings (
     company_email TINYTEXT NULL,                           -- Company Email
     company_url TINYTEXT NULL,                             -- Company URL
     payment_terms TEXT NULL,                               -- Payment Terms
-    days_before_create_invoice INT NULL,                   -- Number of days before anniversary date to create invoice
+    days_before_renewal INT NULL,                          -- Number of days before renewal date to allow renewals
+    days_after_expired INT NULL,                           -- Number of days after renewal date expired
     PRIMARY KEY (id)
 );
 
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index fbd0c29..b4dccd3 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -29,5 +29,6 @@ $glmMembersBillingDbVersions = array(
     '0.0.13' => array('version' => '0.0.13', 'tables' => 14),
     '0.0.14' => array('version' => '0.0.14', 'tables' => 14),
     '0.0.15' => array('version' => '0.0.15', 'tables' => 14),
+    '0.0.16' => array('version' => '0.0.16', 'tables' => 14),
 );
 
diff --git a/setup/databaseScripts/update_database_V0.0.16.sql b/setup/databaseScripts/update_database_V0.0.16.sql
new file mode 100644
index 0000000..70d3f9e
--- /dev/null
+++ b/setup/databaseScripts/update_database_V0.0.16.sql
@@ -0,0 +1,14 @@
+-- Gaslight Media Billing Database
+-- File Created: 03/28/2018
+-- Database Version: 0.0.15
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+-- Update name for renewal date
+ALTER TABLE {prefix}settings CHANGE days_before_create_invoice days_before_renewal INT;   -- Number of days before renewal_date to allow
+
+----
+
+-- Add date for after renewal date
+ALTER TABLE {prefix}settings ADD days_after_expired INT NULL;                             -- Number of days after renewal date expired
diff --git a/views/admin/settings/billing.html b/views/admin/settings/billing.html
index cd077d2..f704fd6 100644
--- a/views/admin/settings/billing.html
+++ b/views/admin/settings/billing.html
@@ -22,20 +22,38 @@
 
 
                         <tr>
-                            <th style="text-align: right;" {if $billingSettings.fieldRequired.days_before_create_invoice} class="glm-required"}{/if}>
-                                Days Before Anniversary Date<br>
-                                to Create Invoice<br>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.days_before_renewal} class="glm-required"}{/if}>
+                                Days Before Renewal Date<br>
+                                to Allow Membership Renewal<br>
                                 Must be a number
                             </th>
-                            <td {if $billingSettings.fieldFail.days_before_create_invoice}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
+                            <td {if $billingSettings.fieldFail.days_before_renewal}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
                                 <input
                                     type="text"
-                                    name="days_before_create_invoice"
-                                    value="{$billingSettings.fieldData.days_before_create_invoice}"
+                                    name="days_before_renewal"
+                                    value="{$billingSettings.fieldData.days_before_renewal}"
                                     class="glm-form-text-input-short"
                                     pattern="([0-9])*"
                                     />
-                            {if $billingSettings.fieldFail.days_before_create_invoice}<p>{$billingSettings.fieldFail.days_before_create_invoice}</p>{/if}<br>
+                            {if $billingSettings.fieldFail.days_before_renewal}<p>{$billingSettings.fieldFail.days_before_renewal}</p>{/if}<br>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.days_after_expired} class="glm-required"}{/if}>
+                                Days After Renewal Date<br>
+                                Membership Expires<br>
+                                Must be a number
+                            </th>
+                            <td {if $billingSettings.fieldFail.days_after_expired}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
+                                <input
+                                    type="text"
+                                    name="days_after_expired"
+                                    value="{$billingSettings.fieldData.days_after_expired}"
+                                    class="glm-form-text-input-short"
+                                    pattern="([0-9])*"
+                                    />
+                            {if $billingSettings.fieldFail.days_after_expired}<p>{$billingSettings.fieldFail.days_after_expired}</p>{/if}<br>
                             </td>
                         </tr>
 
-- 
2.17.1