From 457452150a0158600b6e3ac953a17f5bfc5ec1bc Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 2 Dec 2016 09:56:19 -0500
Subject: [PATCH] Getting the coupon search form to work on member tab

If it's the member tab have to adjust the hidden fields for it.
---
 models/admin/coupons/index.php     |  8 +++----
 models/admin/coupons/list.php      | 12 ++++++----
 setup/adminTabs.php                | 38 ++++++++++++++----------------
 views/admin/coupons/list.html      |  6 +++++
 views/admin/dashboard/coupons.html |  4 ++--
 5 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/models/admin/coupons/index.php b/models/admin/coupons/index.php
index 89b9e59..00cbd93 100644
--- a/models/admin/coupons/index.php
+++ b/models/admin/coupons/index.php
@@ -101,15 +101,15 @@ class GlmMembersAdmin_coupons_index extends GlmDataCoupons
         // Check if there's a logged in user who is locked to their own entity
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
         if ($lockedToMember) {
-            $memberID = $lockedToMember;
+            $memberID       = $lockedToMember;
             $lockedToMember = $memberID;
-            $lockedWhereT = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID;
-            $lockedWhere = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID;
+            $lockedWhereT   = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID;
+            $lockedWhere    = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID;
         }
 
         // Check for required Coupon Categories
         require_once GLM_MEMBERS_COUPONS_PLUGIN_CLASS_PATH.'/data/dataCouponCategories.php';
-        $CouponCategories = new GlmDataCouponCategories($this->wpdb, $this->config);
+        $CouponCategories      = new GlmDataCouponCategories($this->wpdb, $this->config);
         $couponCategoriesStats = $CouponCategories->getStats();
         if ($couponCategoriesStats && $couponCategoriesStats > 0) {
             $haveCategories = true;
diff --git a/models/admin/coupons/list.php b/models/admin/coupons/list.php
index 650c173..8e5572a 100644
--- a/models/admin/coupons/list.php
+++ b/models/admin/coupons/list.php
@@ -92,6 +92,7 @@ class GlmMembersAdmin_coupons_list extends GlmDataCoupons
     public function modelAction($actionData = false)
     {
 
+        $memberTab         = false;
         $lockedToMember    = false;
         $numbCoupons       = 0;
         $option            = 'list';
@@ -145,12 +146,14 @@ class GlmMembersAdmin_coupons_list extends GlmDataCoupons
 
         // Check for Member Menu Use
         } elseif (defined('GLM_COUPONS_MEMBER_MENU')) {
+            $memberTab = true;
 
             // Try to get member ID
             $memberID = (isset($_REQUEST['member']) ? $_REQUEST['member'] : 0);
 
             // If there's no valid member ID, we can't continue
-            if ($memberID == 0) {
+            if ( $memberID == 0 ) {
+                die('here');
                 return array(
                     'status'           => false,
                     'menuItemRedirect' => 'error',
@@ -164,12 +167,12 @@ class GlmMembersAdmin_coupons_list extends GlmDataCoupons
         }
 
         // If not a valid member ID
-        if ($memberID > 0) {
+        if ( $memberID && $memberID > 0 ) {
 
             // Get base member information
             require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php';
-            $Member     = new GlmDataMembers($this->wpdb, $this->config);
-            $memberData = $Member->getEntry($memberID);
+            $Member     = new GlmDataMembers( $this->wpdb, $this->config );
+            $memberData = $Member->getEntry( $memberID );
 
             if (!$memberData) {
                 return array(
@@ -478,6 +481,7 @@ class GlmMembersAdmin_coupons_list extends GlmDataCoupons
 
         }
         $templateData = array(
+            'memberTab'         => $memberTab,
             'enable_members'    => $enable_members,
             'lockedToMember'    => $lockedToMember,
             'option'            => $option,
diff --git a/setup/adminTabs.php b/setup/adminTabs.php
index c0efef6..72a9cb0 100644
--- a/setup/adminTabs.php
+++ b/setup/adminTabs.php
@@ -13,27 +13,25 @@
  * @link     http://dev.gaslightmedia.com/
  */
 
-/*
- * To add a new tab to an existing Member DB page use a block
- * like this and replace the {} parameters.
- *
- * add_filter('glm-member-db-add-tab-for-{menu name}',
- *     function($addOnTabs) {
- *         $newTabs = array(
- *             array(
- *                 'text' => '{text for display on tab}',
- *                 'menu' => '{menu name}',
- *                 'action' => '{action to perform}'
- *             )
- *         );
- *         $addOnTabs = array_merge($addOnTabs, $newTabs);
- *         return $addOnTabs;
- *     }
- * );
- *
- */
-
 if (current_user_can('glm_members_members')) {
+
+    add_filter(
+        'glm-member-db-add-tab-for-member',
+        function( $addOnTabs ){
+            $newTabs = array(
+                array(
+                    'text'   => 'Coupons',
+                    'menu'   => 'member',
+                    'action' => 'coupons',
+                    'option' => 'list',
+                )
+            );
+            $addOnTabs = array_merge( $addOnTabs, $newTabs );
+            return $addOnTabs;
+        }
+    );
+
+
     add_filter(
         'glm-member-db-add-tab-for-settings',
         function($addOnTabs) {
diff --git a/views/admin/coupons/list.html b/views/admin/coupons/list.html
index d489868..2f6578e 100644
--- a/views/admin/coupons/list.html
+++ b/views/admin/coupons/list.html
@@ -17,7 +17,13 @@
 {/if}
 
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
+        {if $memberTab}
+        <input type="hidden" name="glm_action" value="coupons">
+        <input type="hidden" name="option" value="{$option}">
+        <input type="hidden" name="member" value="{$memberID}">
+        {else}
         <input type="hidden" name="glm_action" value="list">
+        {/if}
         <input type="hidden" name="prevStart" value="{$prevStart}">
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
diff --git a/views/admin/dashboard/coupons.html b/views/admin/dashboard/coupons.html
index a49ba6c..7dbb8cf 100644
--- a/views/admin/dashboard/coupons.html
+++ b/views/admin/dashboard/coupons.html
@@ -25,9 +25,9 @@
                 <td class="glm-nowrap">
         {if $p.ref_type.value}
              {if $lockedToMember}
-                    <a href="{$thisUrl}?page=glm-members-admin-menu-coupons-list&glm_action=list&option=edit&member={$p.ref_dest_id}&coupon={$p.id}">{$p.name}</a>
+                 <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=coupons&option=edit&member={$p.ref_dest_id}&coupon={$p.id}">{$p.name}</a>
              {else}
-                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=coupons&option=edit&member={$p.ref_dest_id}&coupon={$p.id}">{$p.name}</a>
+                <a href="{$thisUrl}?page=glm-members-admin-menu-coupons-list&glm_action=list&option=edit{if $p.ref_dest_id}&member={$p.ref_dest_id}{/if}&coupon={$p.id}">{$p.name}</a>
              {/if}
         {else}
                     <a href="{$thisUrl}?page={$thisPage}&glm_action=coupons&option=edit&coupon={$p.id}">{$p.name}</a>
-- 
2.17.1