From e18be5c720acc050e5efc1a8b4393de92af72829 Mon Sep 17 00:00:00 2001 From: laury Date: Tue, 24 May 2016 15:02:00 -0400 Subject: [PATCH] Packaging link views edited and added --- models/front/hooked/detail.php | 6 +- models/front/hooked/memberList.php | 75 +++++++++++++++++++ models/front/packaging/list.php | 5 +- setup/adminHooks.php | 2 +- setup/frontHooks.php | 12 ++- setup/requiredPages.php | 8 ++ setup/shortcodes.php | 24 +++++- views/front/packaging/detail.html | 2 +- .../packagesLinkForMemberDetail.html | 2 +- .../packaging/packagesLinkForMemberList.html | 7 ++ 10 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 models/front/hooked/memberList.php create mode 100644 views/front/packaging/packagesLinkForMemberList.html diff --git a/models/front/hooked/detail.php b/models/front/hooked/detail.php index 60bf860..e3773d6 100644 --- a/models/front/hooked/detail.php +++ b/models/front/hooked/detail.php @@ -1,7 +1,7 @@ + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +// Load packages data abstract +require_once(GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'); + +/* + * This class performs the work for displaying members packages. + */ +class GlmMembersFront_packaging_detailHook extends GlmDataPackages +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + /* + * Constructor + * + * This contructor sets up this model. At this time that only includes + * storing away the WordPress data object. + * + * @return object Class object + * + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct(false, false); + + } + + public function getPackageDetail($id) + { + + return ('123 we be here'); + + /* + * Merge data returned from the model with the selected view + */ + + } + +} + +?> \ No newline at end of file diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php index 0b592e4..5100de1 100644 --- a/models/front/packaging/list.php +++ b/models/front/packaging/list.php @@ -231,7 +231,10 @@ class GlmMembersFront_packaging_list extends GlmDataPackages case 'member-list': $view = 'listForMemberListing.html'; break; - case 'packages-link': + case 'list-packages-link': + $view = 'packagesLinkForMemberList.html'; + break; + case 'detail-packages-link': $view = 'packagesLinkForMemberDetail.html'; break; case 'detail-sidemenu'; diff --git a/setup/adminHooks.php b/setup/adminHooks.php index 6860589..85608b0 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -28,7 +28,7 @@ // Add content to member detail page -add_filter('glm-member-db-admin-management-hoooksHelp', function($content) { +add_filter('glm-member-db-admin-management-hooksHelp', function($content) { // Read in this plugin/addon hook help file $fname = GLM_MEMBERS_PACKAGING_PLUGIN_PATH.'/setup/hooksHelp.html'; diff --git a/setup/frontHooks.php b/setup/frontHooks.php index c4bdd98..888dbb4 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -60,9 +60,19 @@ if (isset($this->config['addOns']['glm-member-db'])) { 2 ); + // Add package link to member list page + add_filter('glm-member-db-front-members-list-linksBottom', function($content, $id) { + $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="list-packages-link" order="title"]'); + $content .= $packageData; + return $content; + }, + 10, + 2 + ); + // Add internal page content links to member detail page add_filter('glm-member-db-front-members-detail-linksBottom', function($content, $id) { - $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="packages-link" order="title"]'); + $packageData = do_shortcode('[glm-members-packaging-list member='.$id.', template="detail-packages-link" order="title"]'); $content .= $packageData; return $content; }, diff --git a/setup/requiredPages.php b/setup/requiredPages.php index 94af125..16895fb 100644 --- a/setup/requiredPages.php +++ b/setup/requiredPages.php @@ -34,6 +34,14 @@ * for management purposes * * When in doubt just use '0' + * + * The underscored_title field will be added to the default option prefix as + * defined in GLM Associate. This will currently result in an option as follows: + * + * "glm_members_database_option_".$reqPage['underscored_title'] + * + * so glm_members_database_option_packaging_list_id + * and glm_members_database_option_packaging_detail_id * */ diff --git a/setup/shortcodes.php b/setup/shortcodes.php index 2b171f0..3e4011f 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -118,7 +118,8 @@ $glmMembersPackagingShortcodes = array( ); $glmMembersPackagingShortcodesDescription = ' - + + @@ -215,5 +216,24 @@ $glmMembersPackagingShortcodesDescription = '

- + + + + + + + + + + +
ShortcodeAttributeDescription
[glm-members-packaging-list]  
[glm-members-packaging-member-list]  +

+ Displays the packages of a specific member. +

+
 id="{member ID}" +

+ The "id" attribute is used to select the member for which to display the + packages. This is a required attribute. +

+
'; \ No newline at end of file diff --git a/views/front/packaging/detail.html b/views/front/packaging/detail.html index 3b37097..be15e14 100644 --- a/views/front/packaging/detail.html +++ b/views/front/packaging/detail.html @@ -44,7 +44,7 @@ - + {if $package.member.logo && $settings.detail_show_logo}
diff --git a/views/front/packaging/packagesLinkForMemberDetail.html b/views/front/packaging/packagesLinkForMemberDetail.html index a35bb7c..77784bb 100644 --- a/views/front/packaging/packagesLinkForMemberDetail.html +++ b/views/front/packaging/packagesLinkForMemberDetail.html @@ -1,3 +1,3 @@ {if $settings.detail_show_packages && $packages} - Packages & Deals + Packages & Deals {/if} diff --git a/views/front/packaging/packagesLinkForMemberList.html b/views/front/packaging/packagesLinkForMemberList.html new file mode 100644 index 0000000..a04caea --- /dev/null +++ b/views/front/packaging/packagesLinkForMemberList.html @@ -0,0 +1,7 @@ + +{if $settings.list_show_packages_link} + {if $packages} + Packages & Deals + {/if} +

packages: {$packages}

+{/if} \ No newline at end of file -- 2.17.1