From 327e312016c0aa9a613f71ba60611274813f7aab Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Mon, 24 Jul 2017 10:55:58 -0400
Subject: [PATCH] Updating packaging to Packages. Add member to package
 dashboard.

Adding the member column to the packages dashboard.
Updating the admin navigation name from Packaging to Packages.
---
 index.php                            | 6 +++---
 readme.txt                           | 5 +++++
 setup/adminMenus.php                 | 6 +++---
 views/admin/dashboard/packaging.html | 6 ++++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index 69f3fa7..c3d4d09 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Packaging
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media Members Database.
- * Version: 1.2.12
+ * Version: 1.2.13
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabasePackagingAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.2.10
+ * @version 1.2.13
  */
 
 /*
@@ -37,7 +37,7 @@
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.12');
+define('GLM_MEMBERS_PACKAGING_PLUGIN_VERSION', '1.2.13');
 define('GLM_MEMBERS_PACKAGING_PLUGIN_DB_VERSION', '1.1.6');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/readme.txt b/readme.txt
index b541db5..5f0f87b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -25,3 +25,8 @@ e.g.
 1. Activate the plugin through the 'Plugins' menu in WordPress
 
 
+== Changelog ==
+
+= 1.2.13 =
+* Update name in navigation to Packages
+* Adding the member column to the package dashboard.
diff --git a/setup/adminMenus.php b/setup/adminMenus.php
index 63a5ab9..718be7e 100644
--- a/setup/adminMenus.php
+++ b/setup/adminMenus.php
@@ -32,8 +32,8 @@
 
 add_submenu_page(
     $mainMenuSlug,                   // Parent slug
-    'Packaging',                                        // Page title
-    'Packaging',                                        // Menu Title
+    'Packages',                                        // Page title
+    'Packages',                                        // Menu Title
     'glm_members_edit_my_entity',                       // Capability required
     'glm-members-admin-menu-packaging-index',           // Menu slug
     function() {$this->controller('packaging');}
@@ -53,4 +53,4 @@ if ($this->config['loggedInUser']['contactUser']) {
 
 }
 
-*/
\ No newline at end of file
+*/
diff --git a/views/admin/dashboard/packaging.html b/views/admin/dashboard/packaging.html
index 563089e..b778524 100644
--- a/views/admin/dashboard/packaging.html
+++ b/views/admin/dashboard/packaging.html
@@ -13,6 +13,7 @@
                 <thead>
                     <tr>
                         <th>Package</th>
+                        <th>Member</th>
                         <th>Start</th>
                         <th>End</th>
                         <th>Expire</th>
@@ -32,6 +33,11 @@
         {else}
                     <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}">{$p.title}</a>
         {/if}
+                <td>
+                    {if $p.member.member_name}
+                    <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$p.member.member_pointer}">{$p.member.member_name}</a>
+                    {/if}
+                </td>
                 </td>
                 <td>
                     {$p.start_date.date}
-- 
2.17.1