Various minor bug and comment fixes.

diff --git a/models/admin/ajax/registrantsListExport.php b/models/admin/ajax/registrantsListExport.php
index f969327..6a27a1b 100644 (file)
--- 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 (file)
--- 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 "<pre>".print_r($cart,1)."</pre>";

diff --git a/views/admin/registrations/requestDashboard.html b/views/admin/registrations/requestDashboard.html
index 4a8f847..bb5d665 100644 (file)
--- a/views/admin/registrations/requestDashboard.html
+++ b/views/admin/registrations/requestDashboard.html
@@ -4,168 +4,181 @@
 
 {$acct = $cart.request.account}
 
-<div class="glm-admin-table-inner glm-admin-table">
-
-{if $deleted}
-    <div style="border-bottom: 1px solid black; padding: 10px; margin: 10px;">
-        <h2 class="glm-error">This request has been DELETED!</h2>
-        <p>* All {$terms.reg_term_attendee_plur} included in this request have been removed along with all associated data.</p>
-        <p>* All {$terms.reg_term_attendee} availability inventory that was consumed by this request has been made available again.</p>
-        <p>* This deleted request cannot be restored.</p>
-    </div>
-{else}
-    <a href="" class="button button-secondary glm-button glm-right" id="glm-admin-reg_delete-request">Delete Request</a>
-{/if}
-
-    <h1>Request</h1>
-
-    <div id="glm-admin-member-registrations-request-overview" class="glm-admin-table">
-        <div class="glm-row">
-            <div class="glm-small-4 glm-left">
-                <div class="glm-admin-table">
-
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Request ID:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.id}
-                        </div>
-                    </div>
-
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Account Submitting Request:</h3>
+{if $haveCart}
+    <div class="glm-admin-table-inner glm-admin-table">
+    {if $deleted}
+        <div style="border-bottom: 1px solid black; padding: 10px; margin: 10px;">
+            <h2 class="glm-error">This request has been DELETED!</h2>
+            <p>* All {$terms.reg_term_attendee_plur} included in this request have been removed along with all associated data.</p>
+            <p>* All {$terms.reg_term_attendee} availability inventory that was consumed by this request has been made available again.</p>
+            <p>* This deleted request cannot be restored.</p>
+        </div>
+    {else}
+        <a href="" class="button button-secondary glm-button glm-right" id="glm-admin-reg_delete-request">Delete Request</a>
+    {/if}
+    
+        <h1>Request</h1>
+    
+        <div id="glm-admin-member-registrations-request-overview" class="glm-admin-table">
+            <div class="glm-row">
+                <div class="glm-small-4 glm-left">
+                    <div class="glm-admin-table">
+    
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Request ID:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.id}
+                            </div>
                         </div>
-                        <div class="glm-small-12 glm-column">
-                            <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&account={$acct}">
-                            {$cart.accounts.$acct.fname} {$cart.accounts.$acct.lname}
-                            </a>
+    {if $cart.request.status.name != 'In Cart'}
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Account Submitting Request:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&account={$acct}">
+                                {$cart.accounts.$acct.fname} {$cart.accounts.$acct.lname}
+                                </a>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.accounts.$acct.email}
+                            </div>
                         </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.accounts.$acct.email}
+    
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Billing Information:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.bill_fname} {$cart.request.bill_lname}{if $cart.request.bill_title}, {$cart.request.bill_title}{/if}
+                            </div>
+                        {if $cart.request.bill_org}
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.bill_org}
+                            </div>
+                        {/if}
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.bill_addr1}
+                            </div>
+                        {if $cart.request.bill_addr2}
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.bill_addr2}
+                            </div>
+                        {/if}
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.bill_city}, {$cart.request.bill_state} {$cart.request.bill_zip} {$cart.request.bill_country}
+                            </div>
                         </div>
+    {/if}
                     </div>
-
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Billing Information:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.bill_fname} {$cart.request.bill_lname}{if $cart.request.bill_title}, {$cart.request.bill_title}{/if}
+                </div>
+                <div class="glm-small-4 glm-left">
+                    <div class="glm-admin-table">
+                        <div class="glm-row">
+    {if $cart.request.status.name != 'In Cart'}                        
+                            <div class="glm-small-12 glm-column">
+                                <h3>Submitted:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.date_submitted.datetime|date_format:"%D"}
+                            </div>
                         </div>
-                    {if $cart.request.bill_org}
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.bill_org}
+    {/if}
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Status:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.status.name}
+                            </div>
                         </div>
-                    {/if}
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.bill_addr1}
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Validated:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {if $cart.request.validated.value}Yes{else}{if $cart.request.validation_message}{$cart.request.validation_message}{else}(not yet validated){/if}{/if}
+                            </div>
                         </div>
-                    {if $cart.request.bill_addr2}
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.bill_addr2}
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Created:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.date_created.datetime}
+                            </div>
                         </div>
-                    {/if}
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.bill_city}, {$cart.request.bill_state} {$cart.request.bill_zip} {$cart.request.bill_country}
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Last Update:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+                                {$cart.request.last_update.datetime}
+                            </div>
                         </div>
                     </div>
-
                 </div>
             </div>
-            <div class="glm-small-4 glm-left">
-                <div class="glm-admin-table">
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Submitted:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.date_submitted.datetime|date_format:"%D"}
-                        </div>
-                    </div>
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Status:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.status.name}
-                        </div>
-                    </div>
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Validated:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {if $cart.request.validated.value}Yes{else}{if $cart.request.validation_message}{$cart.request.validation_message}{else}(not yet validated){/if}{/if}
-                        </div>
-                    </div>
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Created:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.date_created.datetime}
-                        </div>
-                    </div>
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Last Update:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-                            {$cart.request.last_update.datetime}
+            <div class="glm-row">
+                <div class="glm-small-12 glm-left">
+                    <div class="glm-admin-table">
+    
+                        <div class="glm-row">
+                            <div class="glm-small-12 glm-column">
+                                <h3>Notes:</h3>
+                            </div>
+                            <div class="glm-small-12 glm-column">
+        {if $cart.request.notes != ''}
+                                <div style="background-color: white; border: solid black 1px; padding: .2em; margin-top: .2em;">
+                                    {$cart.request.notes}
+                                </div>
+        {else}
+                                (no notes entered)
+        {/if}
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+    
         </div>
-        <div class="glm-row">
-            <div class="glm-small-12 glm-left">
-                <div class="glm-admin-table">
-
-                    <div class="glm-row">
-                        <div class="glm-small-12 glm-column">
-                            <h3>Notes:</h3>
-                        </div>
-                        <div class="glm-small-12 glm-column">
-    {if $cart.request.notes != ''}
-                            <div style="background-color: white; border: solid black 1px; padding: .2em; margin-top: .2em;">
-                                {$cart.request.notes}
-                            </div>
+    </div>
+    
+    <div class="glm-admin-table-inner glm-admin-table">
+    
+   {if $cart.request.status.name != 'In Cart'}
+        <h1>Cart Contents When Submitted</h1>
+        <p class="glm-notice" style="font-size: 1.2em;">
+            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.
+        </p>
+   {else}
+        <h1>Current Cart Contents</h1>
+        <p class="glm-notice" style="font-size: 1.2em;">
+            NOTE: This is the current contents of the cart for this request. This request has not yet been submitted.
+        </p>
+   {/if}
+    
+        <div>
+    
+    {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}
-                        </div>
-                    </div>
-                </div>
-            </div>
         </div>
-
     </div>
-</div>
-
-<div class="glm-admin-table-inner glm-admin-table">
-
-    <h1>Cart Contents When Submitted</h1>
-    <p class="glm-notice" style="font-size: 1.2em;">
-        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.
-    </p>
-
-    <div>
 
-{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 *}
-
+        <div><h2 class="glm-notice">Invalid Request or Request has been Deleted</h2></div>
 {/if}
-    </div>
-</div>
 
 
 <div id="deleteRegSubmissionDialog" title="Delete {$terms.reg_term_registration_cap} Confirmation">