From: Steve Sutton Date: Tue, 27 Sep 2016 20:09:55 +0000 (-0400) Subject: Adding list of packages to dashboard X-Git-Tag: v1.2.0^2~1^2~7 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=6163a654f05a40b68385f74147ebc2354892acfb;p=WP-Plugins%2Fglm-member-db-packaging.git Adding list of packages to dashboard List limited to 5 records. --- diff --git a/models/admin/dashboard/packaging.php b/models/admin/dashboard/packaging.php index dd11aa7..4e3d59d 100644 --- a/models/admin/dashboard/packaging.php +++ b/models/admin/dashboard/packaging.php @@ -13,7 +13,7 @@ * @version 0.1 */ -require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; +require_once GLM_MEMBERS_PACKAGING_PLUGIN_CLASS_PATH.'/data/dataPackages.php'; /** * Dashboard Class Model @@ -21,7 +21,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; * Each Add-On can have one or more dashboards. */ -class GlmMembersAdmin_dashboard_packaging // extends GlmDataEvents +class GlmMembersAdmin_dashboard_packaging extends GlmDataPackages { /** * Word Press Database Object @@ -57,7 +57,7 @@ class GlmMembersAdmin_dashboard_packaging // extends GlmDataEvents $this->config = $config; // Run constructor for members data class - //parent::__construct(false, false); + parent::__construct(false, false); } @@ -101,17 +101,49 @@ class GlmMembersAdmin_dashboard_packaging // extends GlmDataEvents $success = true; $hasLastDownload = false; $lastSearchDate = ''; + $packages = false; + $havePackages = false; // Get list of member events. if ( isset( $this->config['loggedInUser']['contactUser']['ref_dest'] ) && $memberID = filter_var( $this->config['loggedInUser']['contactUser']['ref_dest'], FILTER_VALIDATE_INT) ) { + $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); + if ($lockedToMember) { + $memberID = $lockedToMember; + $lockedToMember = $memberID; + $memberWhere = "T.id = $memberID"; + $lockedWhereT = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID; + $lockedWhere = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID; + $where = ''; + //$packages = $this->getList( $lockedWhereT.$where); + $packages = $this->getList( $lockedWhereT.$where, '', true, 'id', 1, 5 ); + // If we have some, tell the template + if ($packages && count($packages['list']) > 0) { + $havePackages = true; + } + + } } + // If we have list entries - even if it's an empty list + $success = true; + $havePackages = false; + if ($packages !== false) { + $success = true; + + // If we have any entries + if (count($packages) > 0) { + $havePackages = true; + } + } // Compile template data. $templateData = array( - 'memberID' => $memberID, + 'lockedToMember' => $lockedToMember, + 'havePackages' => $havePackages, + 'packages' => $packages['list'], + 'memberID' => $memberID, ); // Return status, suggested view, and data to controller. diff --git a/models/admin/packaging/index.php b/models/admin/packaging/index.php index 20c3215..987a475 100644 --- a/models/admin/packaging/index.php +++ b/models/admin/packaging/index.php @@ -344,4 +344,4 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages } } -?> \ No newline at end of file +?> diff --git a/views/admin/dashboard/packaging.html b/views/admin/dashboard/packaging.html index 2f61a14..bd29a76 100644 --- a/views/admin/dashboard/packaging.html +++ b/views/admin/dashboard/packaging.html @@ -3,8 +3,48 @@

Packages

+  Add a New Package for this {$terms.term_member_cap} 
- here + + + + + + + + + + + {if $havePackages} + {foreach $packages as $p} + + + + + + + {/foreach} + {else} + + {/if} + +
PackageStartEndExpire
+ {if $p.ref_type.value} + {if $lockedToMember} + {$p.title} + {else} + {$p.title} + {/if} + {else} + {$p.title} + {/if} + + {$p.start_date.date} + + {$p.end_date.date} + + {$p.expire_date.date} +
(no packages listed)
diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html index 2810b9f..f254922 100644 --- a/views/admin/packaging/index.html +++ b/views/admin/packaging/index.html @@ -2,12 +2,12 @@ {if $packageUpdated}

Package Updated

{/if} {if $packageError}

Error submitting package, see below...

{/if} - + {if $option == 'edit' || $option == 'add'} - + {if apply_filters('glm_members_permit_admin_members_packaging_edit_package', true)} - + {if $option == 'edit'} {if $lockedToMember}

Edit Package

@@ -15,7 +15,7 @@

Edit Multi-{$terms.term_member_cap} Package

{/if} Delete this Package - +

Cancel

@@ -24,7 +24,7 @@

WARNING:

- Clicking the "Delete this Package" button above will + Clicking the "Delete this Package" button above will delete all of the data and images associated with this package.

@@ -41,8 +41,8 @@ {/if} {/if} Return to Package List - - + +
{if $lockedToMember} @@ -58,7 +58,7 @@ {else} {/if} - + @@ -76,7 +76,7 @@ - - - - + +
Title:
Description: - {php} + {php} wp_editor('{$packageInfo.fieldData.descr|escape:quotes}', 'glm_descr', array( 'media_buttons' => false, // 'quicktags' => false, @@ -154,20 +154,20 @@ {if $packageInfo.fieldFail.position}

{$packageInfo.fieldFail.position}

{/if}
- + {else} - +

Display Package

@@ -233,7 +233,7 @@ @@ -242,29 +242,29 @@
Title:{$packageInfo.fieldData.title}
{if $packageInfo.fieldData.image} - {/if} + {/if}
Start Date:{$packageInfo.fieldData.start_date.date}
Pricing Description:{$packageInfo.fieldData.pricing}
Display Order:{$packageInfo.fieldData.position}
- + {/if} {else} - + {if apply_filters('glm_members_permit_admin_member_packaging_add_package', true)} {if $lockedToMember}
 Add a New Package for this {$terms.term_member_cap} 
{/if} {/if} - - + +
- +--> Search:   

- +

Packages

@@ -283,7 +283,7 @@
{if $p.ref_type.value} - {if $lockedToMember} + {if $lockedToMember} {$p.title} {else} {$p.title} @@ -316,16 +316,16 @@ - + {include file='admin/footer.html'}