From d280fec29ab8487ce374ae4bafdec910c6035b80 Mon Sep 17 00:00:00 2001
From: laury <laury@gaslightmedia.com>
Date: Mon, 22 Aug 2016 09:29:04 -0400
Subject: [PATCH] Link to packages fixed on package detail, custom term
 available

Package detail page now has the link to packages on member detail
working. Same with package list. Can now also change the text
used for member detail link on left-hand side. (also used for
package detail link)
---
 classes/data/dataManagement.php                     | 10 +++++++++-
 classes/data/dataPackages.php                       | 12 ++++++++++++
 index.php                                           |  2 +-
 models/front/packaging/list.php                     |  5 ++++-
 ...tabase_V1.1.3.sql => create_database_V1.1.4.sql} |  5 +++--
 setup/databaseScripts/dbVersions.php                |  3 ++-
 setup/databaseScripts/update_database_V1.1.4.sql    | 10 ++++++++++
 setup/frontHooks.php                                | 10 ++++++++++
 views/admin/management/packaging.html               | 11 +++++++++--
 views/front/packaging/detail.html                   |  2 +-
 .../packaging/packagesLinkForPackageDetail.html     | 13 +++++++++++++
 11 files changed, 74 insertions(+), 9 deletions(-)
 rename setup/databaseScripts/{create_database_V1.1.3.sql => create_database_V1.1.4.sql} (97%)
 create mode 100644 setup/databaseScripts/update_database_V1.1.4.sql
 create mode 100644 views/front/packaging/packagesLinkForPackageDetail.html

diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php
index b68151a..d060bf7 100644
--- a/classes/data/dataManagement.php
+++ b/classes/data/dataManagement.php
@@ -123,7 +123,7 @@ class GlmDataPackagingManagement extends GlmDataAbstract
                 'use' => 'a'
             ),
             
-            // Canonical Page Slug
+            // Member List Link to Packages on Member Detail
             'package_link_text_member_list' => array (
                 'field' => 'package_link_text_member_list',
                 'type' => 'text',
@@ -131,6 +131,14 @@ class GlmDataPackagingManagement extends GlmDataAbstract
                 'use' => 'a'
             ),
             
+            // Member Detail Link to Packages on Member Detail
+            'package_link_text_member_detail' => array (
+                'field' => 'package_link_text_member_detail',
+                'type' => 'text',
+                'required' => false,
+                'use' => 'a'
+            ),
+            
             // 
             'package_list_show_member_image' => array(
                     'field' => 'package_list_show_member_image',
diff --git a/classes/data/dataPackages.php b/classes/data/dataPackages.php
index 47f829c..1f728d8 100644
--- a/classes/data/dataPackages.php
+++ b/classes/data/dataPackages.php
@@ -247,6 +247,18 @@ class GlmDataPackages extends GlmDataAbstract
                 'required' => true,
                 'use' => 'lged'
             ),
+            
+            // Reference Destination Slug
+            'ref_dest_slug' => array (
+                'field' => 'ref_dest',
+                'as' => 'ref_dest_slug',
+                'type' => 'pointer',
+                    'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'members',
+                    'p_field' => 'member_slug',
+                    'p_blank' => true,
+                'required' => true,
+                'use' => 'lged'
+            ),
 
             // Title
             'offsite_url' => array (
diff --git a/index.php b/index.php
index de9ed6e..6d691d6 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.1.13');
-define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.3');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.4');
 
 // 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/models/front/packaging/list.php b/models/front/packaging/list.php
index d227958..f89c91c 100644
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@ -239,6 +239,9 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
             case 'detail-packages-link':
                 $view = 'packagesLinkForMemberDetail.html';
                 break;
+            case 'package-detail-packages-link':
+                $view = 'packagesLinkForPackageDetail.html';
+                break;
             case 'detail-sidemenu';
                 $view = 'packagesSidemenuForMemberDetail.html';
                 break;
@@ -249,7 +252,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
                 $view = 'list.html';
                 break;
         }
-
+        
         // Compile template data
         $templateData = array(
             'siteBaseUrl' => GLM_MEMBERS_SITE_BASE_URL,
diff --git a/setup/databaseScripts/create_database_V1.1.3.sql b/setup/databaseScripts/create_database_V1.1.4.sql
similarity index 97%
rename from setup/databaseScripts/create_database_V1.1.3.sql
rename to setup/databaseScripts/create_database_V1.1.4.sql
index 5f3d5cb..0ebe833 100644
--- a/setup/databaseScripts/create_database_V1.1.3.sql
+++ b/setup/databaseScripts/create_database_V1.1.4.sql
@@ -1,6 +1,6 @@
 -- Gaslight Media Members Database - Packaging 
 -- File Created: 12/02/15 15:27:15
--- Database Version: 1.1.3
+-- Database Version: 1.1.4
 -- Database Creation Script
 -- 
 -- To permit each query below to be executed separately,
@@ -57,7 +57,8 @@ 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_link_text_member_list TINYTEXT NULL,
+  package_link_text_member_detail TINYTEXT NULL,
   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 f0fd85e..60292a0 100644
--- a/setup/databaseScripts/dbVersions.php
+++ b/setup/databaseScripts/dbVersions.php
@@ -18,6 +18,7 @@ $glmMembersPackagingDbVersions = array(
             '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.3' => array('version' => '1.1.3', 'tables' => 3)
+            '1.1.3' => array('version' => '1.1.3', 'tables' => 3),
+            '1.1.4' => array('version' => '1.1.4', 'tables' => 3)
 );
 
diff --git a/setup/databaseScripts/update_database_V1.1.4.sql b/setup/databaseScripts/update_database_V1.1.4.sql
new file mode 100644
index 0000000..4c579c3
--- /dev/null
+++ b/setup/databaseScripts/update_database_V1.1.4.sql
@@ -0,0 +1,10 @@
+-- Gaslight Media Members Database 
+-- File Created: 7/06/16 09:08:33
+-- Database Version: 1.1.4
+-- 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_detail TINYTEXT DEFAULT NULL;
\ No newline at end of file
diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index d454006..94fda5d 100644
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -123,6 +123,16 @@ if (isset($this->config['addOns']['glm-member-db'])) {
         2
     );
 
+    // Add internal page content links to package detail page
+    add_filter('glm-member-db-front-package-detail-linksBottom', function($content, $id) {
+            $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="package-detail-packages-link" order="title"]');
+            $content .= $packageData;
+            return $content;
+        },
+        10,
+        2
+    );
+
     // Add content to member detail page - Get it from the existing package listing shortcode
     add_filter('glm-member-db-front-members-detail-descriptionAfter', function($content, $id) {
             $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="member-detail" order="title"]');
diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html
index 44f5804..0c127c9 100644
--- a/views/admin/management/packaging.html
+++ b/views/admin/management/packaging.html
@@ -22,14 +22,21 @@
                   <input type="text" name="canonical_package_page" value="{$packagingSettings.fieldData.canonical_package_page}" class="glm-form-text-input-medium">
                   {if $packagingSettings.fieldFail.canonical_package_page}<p>{$packagingSettings.fieldFail.canonical_package_page}</p>{/if}
               </td>
-          </tr>
+            </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" placeholder="Packages">
                   {if $packagingSettings.fieldFail.package_link_text_member_list}<p>{$packagingSettings.fieldFail.package_link_text_member_list}</p>{/if}
               </td>
-          </tr>
+            </tr>
+            <tr>
+              <th {if $packagingSettings.fieldRequired.package_link_text_member_detail}class="glm-required"{/if}>Package Link Text for Member Detail:</th>
+              <td {if $packagingSettings.fieldFail.package_link_text_member_detail}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
+                  <input type="text" name="package_link_text_member_detail" value="{$packagingSettings.fieldData.package_link_text_member_detail}" class="glm-form-text-input-medium" placeholder="Packages & Deals">
+                  {if $packagingSettings.fieldFail.package_link_text_member_detail}<p>{$packagingSettings.fieldFail.package_link_text_member_detail}</p>{/if}
+              </td>
+            </tr>
             <tr><td><input class="updateSettings button" type="submit" value="Update Settings" /></td></tr>
         </table>
 
diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html
index b2def21..81088d2 100644
--- a/views/front/packaging/detail.html
+++ b/views/front/packaging/detail.html
@@ -97,7 +97,7 @@
                         {apply_filters('glm-member-db-front-members-detail-linksTop', '', $package.member.id)}
                         {if $package.member.email && $settings.package_detail_show_member_email}<a href="mailto:{$package.member.email}">Email</a>{/if}
 <!--                        {if $settings.package_detail_show_member_coupons && $coupons}<a href="#glm-member-detail-coupons">Coupons</a>{/if}-->
-                        {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $package.member.id)}
+                        {apply_filters('glm-member-db-front-package-detail-linksBottom', '', $package.member.id)}
                     </div>
     
                 </div>
diff --git a/views/front/packaging/packagesLinkForPackageDetail.html b/views/front/packaging/packagesLinkForPackageDetail.html
new file mode 100644
index 0000000..8954aee
--- /dev/null
+++ b/views/front/packaging/packagesLinkForPackageDetail.html
@@ -0,0 +1,13 @@
+{if $havePackages && $packages && $settings.detail_show_packages}
+    {foreach $packages as $p}
+        {if $p@iteration == 1}
+            <a id="glm-member-detail-packages-link" class="link-open-detail-content-data" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.ref_dest_slug}/?expanded=packages">
+                {if $settings.package_link_text_member_detail}
+                    {$settings.package_link_text_member_detail}
+                {else}
+                    Packages & Deals
+                {/if}
+            </a>
+        {/if}
+    {/foreach}
+{/if}
\ No newline at end of file
-- 
2.17.1