Fixed confusion between member ID and member Info ID

diff --git a/classes/data/dataPackages.php b/classes/data/dataPackages.php
index 7119fa1..38f64ba 100644 (file)
--- a/classes/data/dataPackages.php
+++ b/classes/data/dataPackages.php
@@ -83,6 +83,8 @@ class GlmDataPackages extends GlmDataAbstract
      */
     public $MemberInfo;
 
+    public $noMemberWithPackage = false;
+
     /**
      * Constructor
      *
@@ -277,11 +279,16 @@ class GlmDataPackages extends GlmDataAbstract
             // Get entity table
             $table = GLM_MEMBERS_PLUGIN_DB_PREFIX.$this->config['ref_type_table'][$r['ref_type']['value']];
 
-            // Get simplified member data
-            $memberInfoData = $this->MemberInfo->getActiveInfoForMember($r['ref_dest']);
+            // If member data is not being suppressed
+            if (!$this->noMemberWithPackage) {
+
+                // Get simplified member data
+                $memberInfoData = $this->MemberInfo->getActiveInfoForMember($r['ref_dest']);
+
+                if ($memberInfoData) {
+                    $r['member'] = $memberInfoData;
+                }
 
-            if ($memberInfoData) {
-                $r['member'] = $memberInfoData;
             }
 
         }
@@ -318,7 +325,24 @@ class GlmDataPackages extends GlmDataAbstract
 
     }
 
+    /*
+     * Get packages list with member information not included option
+     *
+     * @param string $where Where for query
+     * @param string $orderBy How to order results
+     * @param boolean $noMemberWithPackage Don't include member info if true
+     *
+     * @access public
+     */
+    public function getPackageList($where = 'true', $orderBy = false, $noMemberWithPackage = false)
+    {
+
+        $this->noMemberWithPackage = $noMemberWithPackage;
+        $packages = $this->getList($where, $orderBy);
+
+        return $packages;
 
+    }
 }
 
 ?>
\ No newline at end of file

diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php
index 5100de1..d227958 100644 (file)
--- a/models/front/packaging/list.php
+++ b/models/front/packaging/list.php
@@ -102,6 +102,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
         $status = false;
         $orderBy = '';
         $byMember = false;
+        $noMemberWithPackage = false;   // Say whether to skip getting member data with package results
 
         // Only select packages that are current
         $where = "CURDATE() BETWEEN T.start_date AND T.end_date";
@@ -138,6 +139,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
         $memberID = ($actionData['request']['member'] - 0);
         if ($actionData['request']['member'] > 0) {
             $where .= " AND T.ref_type = ".$this->config['ref_type_numb']['Member']." and T.ref_dest = $memberID";
+            $noMemberWithPackage = true;
         }
 
         // Check for specified output ordering
@@ -179,7 +181,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages
         /*
          * Get the list of packages that meet the previous requirements
          */
-        $packages = $this->getList($where, $orderBy);
+        $packages = $this->getPackageList($where, $orderBy, $noMemberWithPackage);
         if ($packages && count($packages) > 0) {
             $havePackages = true;
             $status = true;