From 1b046846c950da2b7ff7e1c6a4adddd2e19dc51d Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 27 Dec 2017 10:24:55 -0500 Subject: [PATCH] Adding setting for payment_terms Adding a new field for the settings table. Payment Terms - Will output with each invoice just above the payment coupon. --- classes/data/dataSettings.php | 7 +++++++ index.php | 2 +- ..._database_V0.0.6.sql => create_database_V0.0.7.sql} | 1 + setup/databaseScripts/dbVersions.php | 1 + setup/databaseScripts/update_database_V0.0.7.sql | 9 +++++++++ views/admin/billing/invoiceStore.html | 4 +++- views/admin/settings/billing.html | 10 +++++++++- 7 files changed, 31 insertions(+), 3 deletions(-) rename setup/databaseScripts/{create_database_V0.0.6.sql => create_database_V0.0.7.sql} (99%) create mode 100644 setup/databaseScripts/update_database_V0.0.7.sql diff --git a/classes/data/dataSettings.php b/classes/data/dataSettings.php index 4a1cdf2..803472c 100644 --- a/classes/data/dataSettings.php +++ b/classes/data/dataSettings.php @@ -202,6 +202,13 @@ class GlmDataBillingSettings extends GlmDataAbstract 'use' => 'a', ), + // Payment Terms + 'payment_terms' => array( + 'field' => 'payment_terms', + 'type' => 'text', + 'use' => 'a', + ), + ); } diff --git a/index.php b/index.php index 86681b3..7e5fa10 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.6'); +define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.7'); // 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.6.sql b/setup/databaseScripts/create_database_V0.0.7.sql similarity index 99% rename from setup/databaseScripts/create_database_V0.0.6.sql rename to setup/databaseScripts/create_database_V0.0.7.sql index 604d7df..3ea2308 100644 --- a/setup/databaseScripts/create_database_V0.0.6.sql +++ b/setup/databaseScripts/create_database_V0.0.7.sql @@ -183,6 +183,7 @@ CREATE TABLE {prefix}settings ( company_phone TINYTEXT NULL, company_email TINYTEXT NULL, company_url TINYTEXT NULL, + payment_terms TEXT NULL, PRIMARY KEY (id) ); diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index 0be92ba..a96dcda 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -20,5 +20,6 @@ $glmMembersBillingDbVersions = array( '0.0.4' => array('version' => '0.0.4', 'tables' => 12), '0.0.5' => array('version' => '0.0.5', 'tables' => 12), '0.0.6' => array('version' => '0.0.6', 'tables' => 13), + '0.0.7' => array('version' => '0.0.7', 'tables' => 13), ); diff --git a/setup/databaseScripts/update_database_V0.0.7.sql b/setup/databaseScripts/update_database_V0.0.7.sql new file mode 100644 index 0000000..62557b4 --- /dev/null +++ b/setup/databaseScripts/update_database_V0.0.7.sql @@ -0,0 +1,9 @@ +-- Gaslight Media Billing Database +-- File Created: 12/27/2017 +-- Database Version: 0.0.7 +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes + +-- Add payment_term field to the settings table +ALTER TABLE {prefix}settings ADD payment_terms TEXT NULL; diff --git a/views/admin/billing/invoiceStore.html b/views/admin/billing/invoiceStore.html index 0f6c5a3..d493a81 100644 --- a/views/admin/billing/invoiceStore.html +++ b/views/admin/billing/invoiceStore.html @@ -138,6 +138,7 @@   + {if $settings.payment_terms} Payment Terms: @@ -146,9 +147,10 @@
- Membership dues need to be paid by October 1st. + {$settings.payment_terms} + {/if}   Please return Coupon Below with Payment diff --git a/views/admin/settings/billing.html b/views/admin/settings/billing.html index 64378fd..aaab00f 100644 --- a/views/admin/settings/billing.html +++ b/views/admin/settings/billing.html @@ -116,11 +116,19 @@ Company URL - + {if $billingSettings.fieldFail.company_url}

{$billingSettings.fieldFail.company_url}

{/if}
+ + Payment Terms + + + {if $billingSettings.fieldFail.payment_terms}

{$billingSettings.fieldFail.payment_terms}

{/if}
+ + + -- 2.17.1