From 62a07e98609c3fdc99aeb59b9fb6c6b5f7c1f33c Mon Sep 17 00:00:00 2001
From: Laury GvR <laury@gaslightmedia.com>
Date: Mon, 22 Aug 2016 11:30:47 -0400
Subject: [PATCH] Removed unused view file, added checks for terms

Packages sidemenu was no longer used, it is now replaced by
packagesLinkForMemberDetail. That template now reads whether there
is a member detail package link text configured in management, and
if not, it displays Packages & Deals like normal.
---
 setup/frontHooks.php                                     | 9 ---------
 views/front/packaging/packagesLinkForMemberDetail.html   | 8 +++++++-
 views/front/packaging/packagesLinkForMemberList.html     | 2 +-
 .../front/packaging/packagesSidemenuForMemberDetail.html | 3 ---
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 views/front/packaging/packagesSidemenuForMemberDetail.html

diff --git a/setup/frontHooks.php b/setup/frontHooks.php
index 94fda5d..675bf00 100644
--- a/setup/frontHooks.php
+++ b/setup/frontHooks.php
@@ -143,15 +143,6 @@ if (isset($this->config['addOns']['glm-member-db'])) {
         2
     );
 
-    add_filter('glm-member-db-front-members-detail-sidemenuBottom', function($content, $id) {
-            $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="detail-sidemenu" order="title"]');
-            $content .= $packageData;
-            return $content;
-        },
-        10,
-        2
-    );
-
 }
 
 ?>
\ No newline at end of file
diff --git a/views/front/packaging/packagesLinkForMemberDetail.html b/views/front/packaging/packagesLinkForMemberDetail.html
index 77784bb..0d7a563 100644
--- a/views/front/packaging/packagesLinkForMemberDetail.html
+++ b/views/front/packaging/packagesLinkForMemberDetail.html
@@ -1,3 +1,9 @@
 {if $settings.detail_show_packages && $packages}
-    <a href="#glm-member-detail-packages" id="glm-member-detail-packages-link" class="link-open-detail-content-data">Packages & Deals</a>
+    <a href="#glm-member-detail-packages" id="glm-member-detail-packages-link" class="link-open-detail-content-data">
+        {if $settings.package_link_text_member_detail}
+            {$settings.package_link_text_member_detail}
+        {else}
+            Packages & Deals
+        {/if}
+    </a>
 {/if}
diff --git a/views/front/packaging/packagesLinkForMemberList.html b/views/front/packaging/packagesLinkForMemberList.html
index 34e57e6..6e2da10 100644
--- a/views/front/packaging/packagesLinkForMemberList.html
+++ b/views/front/packaging/packagesLinkForMemberList.html
@@ -1,7 +1,7 @@
 {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">
+            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.ref_dest_slug}/?expanded=packages">
                 {if $settings.package_link_text_member_list}
                     {$settings.package_link_text_member_list}
                 {else}
diff --git a/views/front/packaging/packagesSidemenuForMemberDetail.html b/views/front/packaging/packagesSidemenuForMemberDetail.html
deleted file mode 100644
index 0f309c8..0000000
--- a/views/front/packaging/packagesSidemenuForMemberDetail.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{if $settings.detail_show_packages && $packages}
-    <tr><td id="glm-member-detail-packages-button">Packages</td></tr>
-{/if}
\ No newline at end of file
-- 
2.17.1