From: Chuck Scott Date: Mon, 21 Dec 2015 18:50:17 +0000 (-0500) Subject: Cleaned up more output and some user interface additions. X-Git-Tag: v1.0.3^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a395c149ed60b7bf411e8134214ea519cdbd8036;p=WP-Plugins%2Fglm-member-db-packaging.git Cleaned up more output and some user interface additions. --- diff --git a/models/admin/member/packaging.php b/models/admin/member/packaging.php index 51db0c8..a0c7ee2 100644 --- a/models/admin/member/packaging.php +++ b/models/admin/member/packaging.php @@ -238,6 +238,7 @@ class GlmMembersAdmin_member_packaging extends GlmDataPackages $packageID = $_REQUEST['packageID'] - 0; } + // Delete the Package if ($packageID > 0) { $this->deleteEntry($packageID, true); $packageDeleted = true; diff --git a/models/admin/members/packaging.php b/models/admin/members/packaging.php index 6f44177..7ca37d9 100644 --- a/models/admin/members/packaging.php +++ b/models/admin/members/packaging.php @@ -113,6 +113,10 @@ class GlmMembersAdmin_members_packaging extends GlmDataPackages $membersList = $Members->getSimpleMembersList(); } + /* + * Process based on supplied option + */ + switch($option) { case 'add': @@ -191,9 +195,22 @@ class GlmMembersAdmin_members_packaging extends GlmDataPackages break; case 'delete': - if ($id > 0) { - $this->deleteEntry($id, true); + + // Get the package ID + $packageID = 0; + if ($_REQUEST['packageID'] && $_REQUEST['packageID'] != '') { + $packageID = $_REQUEST['packageID'] - 0; + } + + // Delete the package + if ($packageID > 0) { + $this->deleteEntry($packageID, true); + $packageDeleted = true; } + + // Look for matching package elements +// **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** // + break; case 'list': diff --git a/models/front/packaging/list.php b/models/front/packaging/list.php index 64ea48d..4134d7d 100644 --- a/models/front/packaging/list.php +++ b/models/front/packaging/list.php @@ -105,7 +105,9 @@ class GlmMembersFront_packaging_list extends GlmDataPackages // Only select pacakges that are current $where = "CURDATE() BETWEEN T.start_date AND T.end_date"; - // Select by specified type + /* + * Select packages by specified type + */ switch($actionData['request']['type']) { // Member Packages Only @@ -129,7 +131,9 @@ class GlmMembersFront_packaging_list extends GlmDataPackages } - // Check for specified member ID + /* + * Check for specified member ID + */ $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"; @@ -140,7 +144,8 @@ class GlmMembersFront_packaging_list extends GlmDataPackages switch($order_type) { case 'member': - // Need to do this here after getting data + // This is done below after the list of packages has been retrieved. + break; case 'title': $orderBy = 'T.title'; @@ -164,14 +169,24 @@ class GlmMembersFront_packaging_list extends GlmDataPackages } - // Get the selected list of packages + // Order by set "Display Order" is always the second-level sorting method + if ($orderBy != '') { + $orderBy .= ','; + } + $orderBy .= 'position DESC'; + + /* + * Get the list of packages that meeet the previous requirements + */ $packages = $this->getList($where, $orderBy); if ($packages && count($packages) > 0) { $havePackages = true; $status = true; } - // Check for specified output ordering by member name + /* + * Sort by Member + */ function packageMemberCmp($a, $b) { if ($a['ref_dest_name'] == $b['ref_dest_name']) { return 0; diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html index aec0621..6e57ded 100644 --- a/views/admin/member/packaging.html +++ b/views/admin/member/packaging.html @@ -13,7 +13,6 @@ {if $option == 'edit'}

Edit Package

- Return to Package List Delete this Package
@@ -36,7 +35,7 @@ {else}

Add new Package

{/if} - + Return to Package List
@@ -218,7 +217,8 @@ // Date Input $('.glm-date-input').datepicker(); - + + {if $havePackage} // Delete Package dialog $("#deletePackageDialog").dialog({ autoOpen: false, @@ -234,7 +234,8 @@ $('#deletePackageSubmit').click( function() { window.location.replace("{$thisURL}?page={$thisPage}&glm_action=packaging&member={$memberID}&option=delete&packageID={$packageInfo.fieldData.id}"); }); - + {/if} + // Flash certain elements for a short time after display $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500); diff --git a/views/admin/members/packaging.html b/views/admin/members/packaging.html index cf135d7..96e2bb2 100644 --- a/views/admin/members/packaging.html +++ b/views/admin/members/packaging.html @@ -10,10 +10,30 @@ {if $option == 'edit'}

Edit Multi-Member Package

+ Delete this Package + +
+
+

Cancel

+

+
+
+

WARNING:

+

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

+

+ Once deleted, this information will no longer be available and cannot be retrieved! +

+
+
{else}

Add new Multi-Member Package

{/if} - + Return to Package List + @@ -260,6 +280,24 @@ // Flash certain elements for a short time after display $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500); + {if $havePackage} + // Delete Package dialog + $("#deletePackageDialog").dialog({ + autoOpen: false, + minWidth: 400, + dialogClass: "glm-dialog-no-close" + }); + $('#deletePackageButton').click( function() { + $('#deletePackageDialog').dialog('open'); + }); + $('#deletePackageCancel').click( function() { + $("#deletePackageDialog").dialog("close"); + }); + $('#deletePackageSubmit').click( function() { + window.location.replace("{$thisURL}?page={$thisPage}&glm_action=packaging&option=delete&packageID={$packageInfo.fieldData.id}"); + }); + {/if} + /* * Package Members Processing */ diff --git a/views/front/footer.html b/views/front/footer.html index ce3a205..e4b25c0 100644 --- a/views/front/footer.html +++ b/views/front/footer.html @@ -1,5 +1,5 @@ -
+ {if $frontDebug}