From: Chuck Scott <cscott@gaslightmedia.com>
Date: Tue, 16 Feb 2016 15:30:40 +0000 (-0500)
Subject: Changes to deal with updates to main member db tables
X-Git-Tag: v1.1.3^2~24
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=0a6dd01f4ebee9ac232c47993690c892b6da4fa7;p=WP-Plugins%2Fglm-member-db-packaging.git

Changes to deal with updates to main member db tables
---

diff --git a/classes/data/dataPackages.php b/classes/data/dataPackages.php
index 072e722..a696e85 100644
--- a/classes/data/dataPackages.php
+++ b/classes/data/dataPackages.php
@@ -278,7 +278,7 @@ class GlmDataPackages extends GlmDataAbstract
             $table = GLM_MEMBERS_PLUGIN_DB_PREFIX.$this->config['ref_type_table'][$r['ref_type']['value']];
 
             // Get simplified member data
-            $memberInfoData = $this->MemberInfo->getActiveInfoSimplified($r['ref_dest']);
+            $memberInfoData = $this->MemberInfo->getActiveInfoForMemberWithMemberData($r['ref_dest']);
 
             if ($memberInfoData) {
                 $r['member'] = $memberInfoData;
diff --git a/models/admin/member/packaging.php b/models/admin/member/packaging.php
index af93f2e..221598b 100644
--- a/models/admin/member/packaging.php
+++ b/models/admin/member/packaging.php
@@ -303,6 +303,13 @@ class GlmMembersAdmin_member_packaging extends GlmDataPackages
             glmMembersAdmin::addNotice($memberTypes, 'DataBlock', 'Member Types Data');
         }
 
+        if ($memberID) {
+
+            // Also save the mmeber ID in a WordPress "option" in case someone clicks the "Member" sub-menu
+            update_option('glmMembersDatabaseMemberID', $memberID);
+
+        }
+
         // Compile template data
         $templateData = array(
             'havePackages' => $havePackages,
diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php
index 44f42c1..956e640 100644
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@ -178,7 +178,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
         $orderBy .= 'position DESC';
 
         /*
-         * Get the list of packages that meeet the previous requirements
+         * Get the list of packages that meet the previous requirements
          */
         $packages = $this->getList($where, $orderBy);
         if ($packages && count($packages) > 0) {
diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 74d2870..2b171f0 100644
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -60,6 +60,37 @@
  *      ... additional short-codes
  * )
  *
+ * Shortcode descriptions sample
+ *
+ *  <tr>
+ *       <th>[glm-members-sample-shortcode]</th>
+ *       <td>&nbsp;</td>
+ *       <td width="50%">
+ *           <p>
+ *           Displays something related to this add-on.
+ *           </p>
+ *       </td>
+ *   </tr>
+ *   <tr>
+ *       <td>&nbsp;</td>
+ *       <th>type="{types}"</th>
+ *       <td>
+ *           <p>
+ *           The "type" attribute is used to select the type of data to be displayed.
+ *           Below is a list of available list types.
+ *           </p>
+ *           <p>
+ *               <table width="100%">
+ *                   <tr><th colspan=3">List Types</th></tr>
+ *                   <tr><td>one</td><td>Type One</td></tr>
+ *                   <tr><td>two</td><td>Type Two</td></tr>
+ *               </table>
+ *           </p>
+ *
+ *       </td>
+ *   </tr>
+ *
+ *
  */
 
 $glmMembersPackagingShortcodes = array(
diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html
index ddf9ac1..d337740 100644
--- a/views/admin/member/packaging.html
+++ b/views/admin/member/packaging.html
@@ -57,7 +57,9 @@
                         {if $packageInfo.fieldFail.title}<p>{$packageInfo.fieldFail.title}</p>{/if}
                     </td>
                 </tr>
+            {if isset($packageInfo.fieldData.package_slug)}                
                 <tr><th>Name for URLs:</th><td>{$packageInfo.fieldData.package_slug}</p></td></tr>
+            {/if}                
                 <tr>
                     <th>Active:</th>
                     <td>