Misc bug fixes and appearance cleanup.

diff --git a/models/front/registrations/checkoutProcess.php b/models/front/registrations/checkoutProcess.php
index 17ecfda..1ab3e73 100644 (file)
--- a/models/front/registrations/checkoutProcess.php
+++ b/models/front/registrations/checkoutProcess.php
@@ -240,7 +240,7 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
 
                 }
 
-echo "Form Result: <pre>".print_r($formResult,1)."</pre>";
+// echo "Form Result: <pre>".print_r($formResult,1)."</pre>";
 
                 // Save the results in the cart event data
                 $this->cart['events'][$eventKey]['customForm'] = $formResult;
@@ -248,10 +248,10 @@ echo "Form Result: <pre>".print_r($formResult,1)."</pre>";
             }
         }
 
-echo "<pre>".print_r($this->cart['events'],1)."</pre>";
+// echo "<pre>".print_r($this->cart['events'],1)."</pre>";
 
 
-wp_die("KILLING WORDPRESS FOR TESTING IN checkoutProcess.php");
+// wp_die("KILLING WORDPRESS FOR TESTING IN checkoutProcess.php");
 
 
         /*
@@ -523,10 +523,6 @@ wp_die("KILLING WORDPRESS FOR TESTING IN checkoutProcess.php");
         // If COMPLETE, save date, pay method, status, total
         if ($cartStatus == $this->config['submission_status_numb']['COMPLETE']) {
 
-            // Get the HTML cart summary
-            $summary = '';
-/*** NEED TO BUILD SUMMARY ***/
-
             $reqData = array_merge(
                 $reqData,
                 array(

diff --git a/views/admin/registrations/eventDashboard.html b/views/admin/registrations/eventDashboard.html
index 1e00caf..57246d8 100644 (file)
--- a/views/admin/registrations/eventDashboard.html
+++ b/views/admin/registrations/eventDashboard.html
@@ -396,7 +396,7 @@
                         $('#dialogStartTime').val('');
                         $('#dialogEndTime').val('');
                         $('#dialogAttendees').prop('checked', true);
-                        $('#dialogMaxAtt').val(0);
+                        $('#dialogMaxAtt').val({$regEvent.total});
                         $('#dialogRegLine').hide();
                         $('#dialogPendLine').hide();
                         $('#dialogAvailLine').hide();
@@ -511,8 +511,8 @@
                         
                         $('#availabilityTitle').html(calEvent.datetime);
                         $('#dialogRegActive').prop('checked', calEvent.active);
-                        $('#dialogStartTime').val(calEvent.start);
-                        $('#dialogEndTime').val(calEvent.end);
+                        $('#dialogStartTime').val(calEvent.start.format('hh:mm A'));
+                        $('#dialogEndTime').val(calEvent.end.format('hh:mm A'));
                         $('#dialogTimeAllDay').prop('checked', calEvent.allDay);
                         $('#dialogMaxAtt').val(calEvent.max);
                         $('#dialogRegLine').show();

diff --git a/views/admin/registrations/requestsDashboard.html b/views/admin/registrations/requestsDashboard.html
index 065e7c2..06b8521 100644 (file)
--- a/views/admin/registrations/requestsDashboard.html
+++ b/views/admin/registrations/requestsDashboard.html
@@ -8,8 +8,6 @@
 
 <div class="glm-admin-table-inner glm-admin-table">
 
-    <p><a href="{$thisUrl}?page={$thisPage}&glm_action=requests&option=check&requestID={$cart.request.id}" class="button button-secondary glm-button">Check Reguest & Update Holds</a></p>
-
         <table class="wp-list-table striped glm-admin-table">
             <thead>
                 <tr>

diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html
index 1fc0615..e7af4a1 100644 (file)
--- a/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@ -266,12 +266,12 @@
     {if apply_filters('glm-members-customfields-active', false)}
       {foreach $cart.events as $event}
         {assign var="fid" value="glm_reg_customfields_reg_event_`$event.reg_event`"} {* assemble the uid with the current event ID *}      
-        {if apply_filters('glm-members-customfields-have-fields', false, $fid)}
-            <div class="glm-row">
+        {if apply_filters('glm-members-customfields-have-fields', false, $fid)}            <div class="glm-row">
                 <div class="glm-large-6 glm-small-12 glm-columns">
-                    <h4>Additional information for event: {$event.event_name}</h4>
+                    <h4>Additional information requested:</h4>
                     <div class="glm-row">
                         <div class="glm-large-12 glm-columns">
+                        <b>For Event: {$event.event_name}</b>
                 {apply_filters('glm-members-customfields-form-display', '', $fid, $cartId, 'checkoutForm', false)}
                         </div>
                     </div>

diff --git a/views/front/registrations/summaryStore.html b/views/front/registrations/summaryStore.html
index bcfa062..624739a 100644 (file)
--- a/views/front/registrations/summaryStore.html
+++ b/views/front/registrations/summaryStore.html
@@ -1,13 +1,21 @@
 <html>    
     <head>
         <style>
+            
+/* GLM GRID */            
+{literal}
+.glm-small-1{width:5.33333rem}.glm-small-2{width:10.66667rem}.glm-small-3{width:16rem}.glm-small-4{width:21.33333rem}.glm-small-5{width:26.66667rem}.glm-small-6{width:32rem}.glm-small-7{width:37.33333rem}.glm-small-8{width:42.66667rem}.glm-small-9{width:48rem}.glm-small-10{width:53.33333rem}.glm-small-11{width:58.66667rem}.glm-small-12{width:64rem}.glm-medium-1{width:5.33333rem}.glm-medium-2{width:10.66667rem}.glm-medium-3{width:16rem}.glm-medium-4{width:21.33333rem}.glm-medium-5{width:26.66667rem}.glm-medium-6{width:32rem}.glm-medium-7{width:37.33333rem}.glm-medium-8{width:42.66667rem}.glm-medium-9{width:48rem}.glm-medium-10{width:53.33333rem}.glm-medium-11{width:58.66667rem}.glm-medium-12{width:64rem}.glm-large-1{width:5.33333rem}.glm-large-2{width:10.66667rem}.glm-large-3{width:16rem}.glm-large-4{width:21.33333rem}.glm-large-5{width:26.66667rem}.glm-large-6{width:32rem}.glm-large-7{width:37.33333rem}.glm-large-8{width:42.66667rem}.glm-large-9{width:48rem}.glm-large-10{width:53.33333rem}.glm-large-11{width:58.66667rem}.glm-large-12{width:64rem}@media only screen{.glm-small-1{width:8.33333%}.glm-small-2{width:16.66667%}.glm-small-3{width:25%}.glm-small-4{width:33.33333%}.glm-small-5{width:41.66667%}.glm-small-6{width:50%}.glm-small-7{width:58.33333%}.glm-small-8{width:66.66667%}.glm-small-9{width:75%}.glm-small-10{width:83.33333%}.glm-small-11{width:91.66667%}.glm-small-12{width:100%}}@media only screen and (min-width: 40.0625em){.glm-medium-1{width:8.33333%}.glm-medium-2{width:16.66667%}.glm-medium-3{width:25%}.glm-medium-4{width:33.33333%}.glm-medium-5{width:41.66667%}.glm-medium-6{width:50%}.glm-medium-7{width:58.33333%}.glm-medium-8{width:66.66667%}.glm-medium-9{width:75%}.glm-medium-10{width:83.33333%}.glm-medium-11{width:91.66667%}.glm-medium-12{width:100%}}@media only screen and (min-width: 64.0625em){.glm-large-1{width:8.33333%}.glm-large-2{width:16.66667%}.glm-large-3{width:25%}.glm-large-4{width:33.33333%}.glm-large-5{width:41.66667%}.glm-large-6{width:50%}.glm-large-7{width:58.33333%}.glm-large-8{width:66.66667%}.glm-large-9{width:75%}.glm-large-10{width:83.33333%}.glm-large-11{width:91.66667%}.glm-large-12{width:100%}}.glm-row{width:100%;position:relative}.glm-row::after{clear:both}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:64rem;width:100%}.wp-admin .glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:100%;width:100%}.glm-column,.glm-columns{padding-left:0.9375rem;padding-right:0.9375rem;float:left}
+{/literal}            
+
+
             h3 {
                 color: #729d8d;
             }
             .container-table {
                 background-color: white;
                 border: 1px black solid;
-                border-collapse: collapse;                
+                border-collapse: collapse;     
+                width: 98%;           
             }
             .container-table-td{
                 padding: 2px;
@@ -74,12 +82,6 @@
                 height: 2rem;
                 padding-top: .2rem;
             }
-            
-/* GLM GRID */            
-.glm-small-1{width:5.33333rem}.glm-small-2{width:10.66667rem}.glm-small-3{width:16rem}.glm-small-4{width:21.33333rem}.glm-small-5{width:26.66667rem}.glm-small-6{width:32rem}.glm-small-7{width:37.33333rem}.glm-small-8{width:42.66667rem}.glm-small-9{width:48rem}.glm-small-10{width:53.33333rem}.glm-small-11{width:58.66667rem}.glm-small-12{width:64rem}.glm-medium-1{width:5.33333rem}.glm-medium-2{width:10.66667rem}.glm-medium-3{width:16rem}.glm-medium-4{width:21.33333rem}.glm-medium-5{width:26.66667rem}.glm-medium-6{width:32rem}.glm-medium-7{width:37.33333rem}.glm-medium-8{width:42.66667rem}.glm-medium-9{width:48rem}.glm-medium-10{width:53.33333rem}.glm-medium-11{width:58.66667rem}.glm-medium-12{width:64rem}.glm-large-1{width:5.33333rem}.glm-large-2{width:10.66667rem}.glm-large-3{width:16rem}.glm-large-4{width:21.33333rem}.glm-large-5{width:26.66667rem}.glm-large-6{width:32rem}.glm-large-7{width:37.33333rem}.glm-large-8{width:42.66667rem}.glm-large-9{width:48rem}.glm-large-10{width:53.33333rem}.glm-large-11{width:58.66667rem}.glm-large-12{width:64rem}@media only screen{.glm-small-1{width:8.33333%}.glm-small-2{width:16.66667%}.glm-small-3{width:25%}.glm-small-4{width:33.33333%}.glm-small-5{width:41.66667%}.glm-small-6{width:50%}.glm-small-7{width:58.33333%}.glm-small-8{width:66.66667%}.glm-small-9{width:75%}.glm-small-10{width:83.33333%}.glm-small-11{width:91.66667%}.glm-small-12{width:100%}}@media only screen and (min-width: 40.0625em){.glm-medium-1{width:8.33333%}.glm-medium-2{width:16.66667%}.glm-medium-3{width:25%}.glm-medium-4{width:33.33333%}.glm-medium-5{width:41.66667%}.glm-medium-6{width:50%}.glm-medium-7{width:58.33333%}.glm-medium-8{width:66.66667%}.glm-medium-9{width:75%}.glm-medium-10{width:83.33333%}.glm-medium-11{width:91.66667%}.glm-medium-12{width:100%}}@media only screen and (min-width: 64.0625em){.glm-large-1{width:8.33333%}.glm-large-2{width:16.66667%}.glm-large-3{width:25%}.glm-large-4{width:33.33333%}.glm-large-5{width:41.66667%}.glm-large-6{width:50%}.glm-large-7{width:58.33333%}.glm-large-8{width:66.66667%}.glm-large-9{width:75%}.glm-large-10{width:83.33333%}.glm-large-11{width:91.66667%}.glm-large-12{width:100%}}.glm-row{width:100%;position:relative}.glm-row::after{clear:both}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:64rem;width:100%}.wp-admin .glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:100%;width:100%}.glm-column,.glm-columns{padding-left:0.9375rem;padding-right:0.9375rem;float:left}
-
-/*# sourceMappingURL=glm-grid.css.map */
-            
         </style>
     </head>
     <body>
@@ -88,7 +90,7 @@
         </div>
     
         <h3>Checkout Summary</h3>
-        <table class="container-table" width="100%">
+        <table class="container-table">
             <tr>
                 <td class="container-table-td" valign="top">
                     <table class="info-table" width="100%">
@@ -163,9 +165,10 @@
                 </td>
         </table>
         <h3>Registrations</h3>
+        <div class="container-table">
 
     {assign var="summaryType" value="store"}
     {include file='front/registrations/cartSummary.html'}
-
+        </div>
     </body>
 </html>
\ No newline at end of file