From 1b55a1a73603ac887a8fb9e15727ab05be231381 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Fri, 15 Jun 2018 16:09:16 -0400 Subject: [PATCH] Various minor bug and comment fixes. --- models/admin/ajax/registrantsListExport.php | 2 +- models/admin/registrations/requests.php | 58 ++-- .../admin/registrations/requestDashboard.html | 289 +++++++++--------- 3 files changed, 186 insertions(+), 163 deletions(-) diff --git a/models/admin/ajax/registrantsListExport.php b/models/admin/ajax/registrantsListExport.php index f969327..6a27a1b 100644 --- a/models/admin/ajax/registrantsListExport.php +++ b/models/admin/ajax/registrantsListExport.php @@ -73,7 +73,7 @@ class GlmMembersAdmin_ajax_registrantsListExport extends GlmDataRegistrationsReq * * @param $actionData * - * Echos JSON string as response and does not return + * @return void Echos JSON string as response and does not return */ public function modelAction ($actionData = false) { diff --git a/models/admin/registrations/requests.php b/models/admin/registrations/requests.php index 07d83b2..a940390 100644 --- a/models/admin/registrations/requests.php +++ b/models/admin/registrations/requests.php @@ -81,6 +81,9 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ public function modelAction($actionData = false) { + // ***** THIS IS ONLY TEMPORARY AS WE TRANSITION AWAY FROM OPTION FOR LAST REQUEST ID - Can be deleted after 1.0.1 ****** + delete_option('glmMembersDatabaseRegistrationsRequestID'); + $haveRequests = false; $requests = false; $requestID = false; @@ -117,14 +120,37 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ // Make sure it's numeric $requestID = ($_REQUEST['requestID'] - 0); + } else { - // Try to get saved - $requestID = get_option('glmMembersDatabaseRegistrationsRequestID'); + // Try to get last used ID + $requestID = 0; + if (isset($_COOKIE['glmMembersDatabaseRegistrationRequestID']) && $_COOKIE['glmMembersDatabaseRegistrationRequestID'] > 0) { + $requestID = $_COOKIE['glmMembersDatabaseRegistrationRequestID']; + } } - if (!$requestID || $requestID <= 0) { + // If we have a request ID + if ($requestID && $requestID > 0) { + + // Try to check and get the request (cart) + $cart = $regCartSupport->checkRegistrationRequest($requestID); + + // If there's no valid cart + if (!$cart || !isset($cart['status']) || !$cart['status'] ) { + + $cart = false; + $requestID = false; + + // And clear the last selected cookie + setcookie("glmMembersDatabaseRegistrationRequestID", '', time()-3600); + + } else { + $haveCart = true; + } + + } else { $requestID = false; } @@ -134,15 +160,11 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ // Check request and update holds case 'check': - $cart = $regCartSupport->checkRegistrationRequest($requestID); - break; // Display selected registration request dashboard case 'requestDashboard': - $cart = $regCartSupport->getRegistrationCart($requestID); - // If this is a delete request if (isset($_REQUEST['delete']) && $_REQUEST['delete'] = 'true') { @@ -155,16 +177,14 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ if ($result !== false) { $messages[] = $result; } else { + // Say it's deleted and deactivate last request ID cookie $deleted = true; + setcookie("glmMembersDatabaseRegistrationRequestID", '', time()-3600); + $requestID = false; } } - - if ($cart) { - $haveCart = true; - } - $view = 'requestDashboard.html'; break; @@ -173,17 +193,7 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ case 'edit': // If a request ID has been supplied - if ($requestID) { - - // Try to get the complete cart for this request - $cart = $regCartSupport->getRegistrationCart($requestID); - - // If a valid cart was returned - if ($cart && $cart['status']) { - $haveRequest = true; - } else { - $errorMsg = $cart['errorMsg']; - } + if ($cart) { $view = 'requestEdit.html'; @@ -221,7 +231,7 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ // If we have a valid request ID, save that for future use if ($requestID > 0) { - update_option('glmMembersDatabaseRegistrationsRequestID', $requestID); + setcookie("glmMembersDatabaseRegistrationRequestID", $requestID, time()+86400); } // echo "
".print_r($cart,1)."
"; diff --git a/views/admin/registrations/requestDashboard.html b/views/admin/registrations/requestDashboard.html index 4a8f847..bb5d665 100644 --- a/views/admin/registrations/requestDashboard.html +++ b/views/admin/registrations/requestDashboard.html @@ -4,168 +4,181 @@ {$acct = $cart.request.account} -
- -{if $deleted} -
-

This request has been DELETED!

-

* All {$terms.reg_term_attendee_plur} included in this request have been removed along with all associated data.

-

* All {$terms.reg_term_attendee} availability inventory that was consumed by this request has been made available again.

-

* This deleted request cannot be restored.

-
-{else} - Delete Request -{/if} - -

Request

- -
-
-
-
- -
-
-

Request ID:

-
-
- {$cart.request.id} -
-
- -
-
-

Account Submitting Request:

+{if $haveCart} +
+ {if $deleted} +
+

This request has been DELETED!

+

* All {$terms.reg_term_attendee_plur} included in this request have been removed along with all associated data.

+

* All {$terms.reg_term_attendee} availability inventory that was consumed by this request has been made available again.

+

* This deleted request cannot be restored.

+
+ {else} + Delete Request + {/if} + +

Request

+ +
+
+
+
+ +
+
+

Request ID:

+
+
+ {$cart.request.id} +
-
- - {$cart.accounts.$acct.fname} {$cart.accounts.$acct.lname} - + {if $cart.request.status.name != 'In Cart'} +
+
+

Account Submitting Request:

+
+
+ + {$cart.accounts.$acct.fname} {$cart.accounts.$acct.lname} + +
+
+ {$cart.accounts.$acct.email} +
-
- {$cart.accounts.$acct.email} + +
+
+

Billing Information:

+
+
+ {$cart.request.bill_fname} {$cart.request.bill_lname}{if $cart.request.bill_title}, {$cart.request.bill_title}{/if} +
+ {if $cart.request.bill_org} +
+ {$cart.request.bill_org} +
+ {/if} +
+ {$cart.request.bill_addr1} +
+ {if $cart.request.bill_addr2} +
+ {$cart.request.bill_addr2} +
+ {/if} +
+ {$cart.request.bill_city}, {$cart.request.bill_state} {$cart.request.bill_zip} {$cart.request.bill_country} +
+ {/if}
- -
-
-

Billing Information:

-
-
- {$cart.request.bill_fname} {$cart.request.bill_lname}{if $cart.request.bill_title}, {$cart.request.bill_title}{/if} +
+
+
+
+ {if $cart.request.status.name != 'In Cart'} +
+

Submitted:

+
+
+ {$cart.request.date_submitted.datetime|date_format:"%D"} +
- {if $cart.request.bill_org} -
- {$cart.request.bill_org} + {/if} +
+
+

Status:

+
+
+ {$cart.request.status.name} +
- {/if} -
- {$cart.request.bill_addr1} +
+
+

Validated:

+
+
+ {if $cart.request.validated.value}Yes{else}{if $cart.request.validation_message}{$cart.request.validation_message}{else}(not yet validated){/if}{/if} +
- {if $cart.request.bill_addr2} -
- {$cart.request.bill_addr2} +
+
+

Created:

+
+
+ {$cart.request.date_created.datetime} +
- {/if} -
- {$cart.request.bill_city}, {$cart.request.bill_state} {$cart.request.bill_zip} {$cart.request.bill_country} +
+
+

Last Update:

+
+
+ {$cart.request.last_update.datetime} +
-
-
-
-
-
-

Submitted:

-
-
- {$cart.request.date_submitted.datetime|date_format:"%D"} -
-
-
-
-

Status:

-
-
- {$cart.request.status.name} -
-
-
-
-

Validated:

-
-
- {if $cart.request.validated.value}Yes{else}{if $cart.request.validation_message}{$cart.request.validation_message}{else}(not yet validated){/if}{/if} -
-
-
-
-

Created:

-
-
- {$cart.request.date_created.datetime} -
-
-
-
-

Last Update:

-
-
- {$cart.request.last_update.datetime} +
+
+
+ +
+
+

Notes:

+
+
+ {if $cart.request.notes != ''} +
+ {$cart.request.notes} +
+ {else} + (no notes entered) + {/if} +
+
-
-
-
- -
-
-

Notes:

-
-
- {if $cart.request.notes != ''} -
- {$cart.request.notes} -
+
+ +
+ + {if $cart.request.status.name != 'In Cart'} +

Cart Contents When Submitted

+

+ NOTE: The summary below is a historical record (exact copy) of the checkout summary at the time the cart was submitted. + Editing {$terms.reg_term_attendee_plur} and other updates will not change the information below. +

+ {else} +

Current Cart Contents

+

+ NOTE: This is the current contents of the cart for this request. This request has not yet been submitted. +

+ {/if} + +
+ + {if $cart.request.summary} + {$cart.request.summary} {else} - (no notes entered) + + {if $haveCart} + {assign var="summaryType" value="adminRequest"} + {include file='front/registrations/cartSummary.html'} + {/if} {* / if have cart *} + {/if} -
-
-
-
-
-
- -
- -

Cart Contents When Submitted

-

- NOTE: The summary below is a historical record (exact copy) of the checkout summary at the time the cart was submitted. - Editing {$terms.reg_term_attendee_plur} and other updates will not change the information below. -

- -
-{if $cart.request.summary} - {$cart.request.summary} {else} - - {if $haveCart} - {assign var="summaryType" value="adminRequest"} - {include file='front/registrations/cartSummary.html'} - {/if} {* / if have cart *} - +

Invalid Request or Request has been Deleted

{/if} -
-
-- 2.17.1