From 304c29ccdc75fc252f586f96a886bd6697c5e263 Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 19 Aug 2016 09:21:02 -0400
Subject: [PATCH] Added package link text for member list as setting

The member list now uses a setting in the admin management for
packaging, to decide what term to show in the link list of the
grid view on the front end.
---
 classes/data/dataManagement.php                        |  8 ++++++++
 index.php                                              |  2 +-
 ..._database_V1.1.2.sql => create_database_V1.1.3.sql} |  3 ++-
 setup/databaseScripts/dbVersions.php                   |  3 ++-
 setup/databaseScripts/update_database_V1.1.3.sql       | 10 ++++++++++
 views/admin/management/packaging.html                  |  8 ++++++++
 views/front/packaging/packagesLinkForMemberList.html   |  8 +++++++-
 7 files changed, 38 insertions(+), 4 deletions(-)
 rename setup/databaseScripts/{create_database_V1.1.2.sql => create_database_V1.1.3.sql} (97%)
 create mode 100644 setup/databaseScripts/update_database_V1.1.3.sql

diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php
index 6ec0830..b68151a 100644
--- a/classes/data/dataManagement.php
+++ b/classes/data/dataManagement.php
@@ -123,6 +123,14 @@ class GlmDataPackagingManagement extends GlmDataAbstract
                 'use' => 'a'
             ),
             
+            // Canonical Page Slug
+            'package_link_text_member_list' => array (
+                'field' => 'package_link_text_member_list',
+                'type' => 'text',
+                'required' => false,
+                'use' => 'a'
+            ),
+            
             // 
             'package_list_show_member_image' => array(
                     'field' => 'package_list_show_member_image',
diff --git a/index.php b/index.php
index ead861b..9dc2773 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.10');
-define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.2');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.3');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_PACKAGING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.0.0');
diff --git a/setup/databaseScripts/create_database_V1.1.2.sql b/setup/databaseScripts/create_database_V1.1.3.sql
similarity index 97%
rename from setup/databaseScripts/create_database_V1.1.2.sql
rename to setup/databaseScripts/create_database_V1.1.3.sql
index c4165c3..5f3d5cb 100644
--- a/setup/databaseScripts/create_database_V1.1.2.sql
+++ b/setup/databaseScripts/create_database_V1.1.3.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database - Packaging 
 -- File Created: 12/02/15 15:27:15
--- Database Version: 1.1.2
+-- Database Version: 1.1.3
 -- Database Creation Script
 -- 
 -- To permit each query below to be executed separately,
@@ -57,6 +57,7 @@ CREATE TABLE {prefix}package_elements (
 CREATE TABLE {prefix}management (
   id INT NOT NULL AUTO_INCREMENT,
   canonical_package_page TINYTEXT NULL,          -- Canonical page slug for package detail
+  package_link_text_member_list TINYTEXT NULL,          -- Canonical page slug for package detail
   package_list_show_image BOOLEAN DEFAULT '1',  
   package_list_show_short_descr BOOLEAN DEFAULT '1',        
   package_list_show_expire_date BOOLEAN DEFAULT '1',        
diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php
index 0410016..f0fd85e 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -17,6 +17,7 @@ $glmMembersPackagingDbVersions = array(
             '0.0.2' => array('version' => '0.0.2', 'tables' => 2),
             '1.1.0' => array('version' => '1.1.0', 'tables' => 3),
             '1.1.1' => array('version' => '1.1.1', 'tables' => 3),
-            '1.1.2' => array('version' => '1.1.2', 'tables' => 3)
+            '1.1.2' => array('version' => '1.1.2', 'tables' => 3),
+            '1.1.3' => array('version' => '1.1.3', 'tables' => 3)
 );
 
diff --git a/setup/databaseScripts/update_database_V1.1.3.sql b/setup/databaseScripts/update_database_V1.1.3.sql
new file mode 100644
index 0000000..1fa834d
--- /dev/null
+++ b/setup/databaseScripts/update_database_V1.1.3.sql
@@ -0,0 +1,10 @@
+-- Gaslight Media Members Database 
+-- File Created: 7/06/16 09:08:33
+-- Database Version: 1.1.3
+-- Database Update From Previous Version Script
+-- 
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashses
+
+-- Package Management Settings
+ALTER TABLE {prefix}management ADD COLUMN package_link_text_member_list TINYTEXT DEFAULT NULL;
\ No newline at end of file
diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html
index 900c3f6..079521a 100644
--- a/views/admin/management/packaging.html
+++ b/views/admin/management/packaging.html
@@ -22,6 +22,14 @@
                   {if $packagingSettings.fieldFail.canonical_package_page}<p>{$packagingSettings.fieldFail.canonical_package_page}</p>{/if}
               </td>
           </tr>
+            <tr>
+              <th {if $packagingSettings.fieldRequired.package_link_text_member_list}class="glm-required"{/if}>Package Link Text for Member List:</th>
+              <td {if $packagingSettings.fieldFail.package_link_text_member_list}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
+                  <input type="text" name="package_link_text_member_list" value="{$packagingSettings.fieldData.package_link_text_member_list}" class="glm-form-text-input-medium">
+                  {if $packagingSettings.fieldFail.package_link_text_member_list}<p>{$packagingSettings.fieldFail.package_link_text_member_list}</p>{/if}
+              </td>
+          </tr>
+            <tr><td><input class="updateSettings button" type="submit" value="Update Settings" /></td></tr>
         </table>
         
         <!-- Package List Settings -->
diff --git a/views/front/packaging/packagesLinkForMemberList.html b/views/front/packaging/packagesLinkForMemberList.html
index ffb2a67..34e57e6 100644
--- a/views/front/packaging/packagesLinkForMemberList.html
+++ b/views/front/packaging/packagesLinkForMemberList.html
@@ -1,7 +1,13 @@
 {if $havePackages && $packages && $settings.list_show_packages_link}
     {foreach $packages as $p}
         {if $p@iteration == 1}
-            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/?expanded=packages">Packages & Deals</a>
+            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/?expanded=packages">
+                {if $settings.package_link_text_member_list}
+                    {$settings.package_link_text_member_list}
+                {else}
+                    Packages
+                {/if}
+            </a>
         {/if}
     {/foreach}
 {/if}
\ No newline at end of file
-- 
2.17.1