From: Chuck Scott Date: Fri, 19 Feb 2016 19:48:36 +0000 (-0500) Subject: Reorganized again. X-Git-Tag: v1.1.3^2~23 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=3a5bbf59cf87cf8b3eda04f260b2e75383b941df;p=WP-Plugins%2Fglm-member-db-packaging.git Reorganized again. --- diff --git a/classes/data/dataPackages.php b/classes/data/dataPackages.php index a696e85..7119fa1 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->getActiveInfoForMemberWithMemberData($r['ref_dest']); + $memberInfoData = $this->MemberInfo->getActiveInfoForMember($r['ref_dest']); if ($memberInfoData) { $r['member'] = $memberInfoData; diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php index 956e640..3955af6 100644 --- a/models/front/packaging/list.php +++ b/models/front/packaging/list.php @@ -189,7 +189,7 @@ class GlmMembersFront_packaging_list extends GlmDataPackages /* * Sort by Member */ - if (false && $havePackages && $actionData['request']['order'] == 'member') { + if ($havePackages && $actionData['request']['order'] == 'member') { // Create empty array that will take all the data by member $members = array(); diff --git a/views/front/packaging/listForMemberDetail.html b/views/front/packaging/listForMemberDetail.html index 0734e8c..5746e8c 100644 --- a/views/front/packaging/listForMemberDetail.html +++ b/views/front/packaging/listForMemberDetail.html @@ -1,10 +1,12 @@ {if $settings.detail_show_packages && $havePackages && $packages} +

Packages

{foreach $packages as $p} +