Fixed various undefined references and other misc warnings.

diff --git a/models/admin/ajax/updateAvailability.php b/models/admin/ajax/updateAvailability.php
index 037aae4..2f1c672 100644 (file)
--- a/models/admin/ajax/updateAvailability.php
+++ b/models/admin/ajax/updateAvailability.php
@@ -210,9 +210,6 @@
 
         // re-calculate the total
         $avail = $max - $regTime['attendee_count'] - $regTime['attendees_pending'];
-trigger_error('start = '.$startTime,E_USER_NOTICE);
-trigger_error('end = '.$endTime,E_USER_NOTICE);
-trigger_error(print_r($_REQUEST,1),E_USER_NOTICE);
 
         // Try to update the reg_time entry
         $this->wpdb->update(

diff --git a/models/admin/registrations/events_notifications.php b/models/admin/registrations/events_notifications.php
index 847c001..a9bfa6c 100644 (file)
--- a/models/admin/registrations/events_notifications.php
+++ b/models/admin/registrations/events_notifications.php
@@ -19,18 +19,25 @@ $Notifications = new GlmDataRegistrationsRegNotification($this->wpdb, $this->con
 $regEvent = $this->getEntry($regEventID);
 // echo '<pre>$regEvent: ' . print_r( $regEvent, true ) . '</pre>';
 
+// Delete
 if ( isset( $_REQUEST['delete'] ) && filter_var( $_REQUEST['delete'], FILTER_VALIDATE_BOOLEAN ) ) {
     $regNotifications = $Notifications->getList("T.reg_event = $regEventID", 'notification_days');
     $view = 'eventNotifications';
+
+// Edit
 } else if ( isset( $_REQUEST['id'] ) && $notice_id = filter_var( $_REQUEST['id'], FILTER_VALIDATE_INT ) ) {
     $regNotifications = $Notifications->editEntry( $notice_id );
     $view = 'eventEditNotification';
-    $days = $regNotifications['notification_days'];
+    $days = $regNotifications['fieldData']['notification_days'];
     $when = ( $days > 0 ) ? 'after' : 'before';
+
+// New
 } else if ( isset( $_REQUEST['new'] ) && filter_var( $_REQUEST['new'], FILTER_VALIDATE_BOOLEAN ) ) {
     $regNotifications = $Notifications->newEntry();
     $view = 'eventEditNotification';
     $newEntry = true;
+
+// List
 } else {
     $regNotifications = $Notifications->getList("T.reg_event = $regEventID", 'notification_days');
     $view = 'eventNotifications';

diff --git a/views/admin/registrations/eventEditNotification.html b/views/admin/registrations/eventEditNotification.html
index 5d254ef..632e67e 100644 (file)
--- a/views/admin/registrations/eventEditNotification.html
+++ b/views/admin/registrations/eventEditNotification.html
@@ -21,7 +21,7 @@
     <input type="hidden" name="regEventID" value="{$regEvent.id}">
     <div id="notificationsContainer">
         <div class="glm-row">&nbsp;</div>
-        <div id="notificationContainer_{$regNotifications.fieldData.id}" class="glm-row">
+        <div {if !$newEntry}id="notificationContainer_{$regNotifications.fieldData.id}"{/if} class="glm-row">
             <div class="glm-small-12 glm-large-3 glm-column">
                 <div class="glm-row">
                     <div class="glm-small-12 glm-column">

diff --git a/views/admin/registrations/eventNotifications.html b/views/admin/registrations/eventNotifications.html
index 496afa9..90d81f8 100644 (file)
--- a/views/admin/registrations/eventNotifications.html
+++ b/views/admin/registrations/eventNotifications.html
@@ -27,7 +27,7 @@
     <tbody>
         {if $regNotifications}
             {foreach $regNotifications as $n}
-                <tr class="{if $r@iteration is div by 2}alternate{/if}">
+                <tr class="{if $n@iteration is div by 2}alternate{/if}">
                     <td>{$n.id}</td>
                     <td>
                         <a

diff --git a/views/admin/registrations/eventPaymentCodes.html b/views/admin/registrations/eventPaymentCodes.html
index 945d23c..973d1e3 100644 (file)
--- a/views/admin/registrations/eventPaymentCodes.html
+++ b/views/admin/registrations/eventPaymentCodes.html
@@ -7,7 +7,7 @@
 {if $option == 'globalCodes'}
     <h1>Global {$terms.reg_term_payment_code_plur_cap}</h1>
 {else}
-    <h1>{$terms.reg_term_event_cap} {$terms.reg_term_payment_code_plur_Cap}</h1>
+    <h1>{$terms.reg_term_event_cap} {$terms.reg_term_payment_code_plur_cap}</h1>
 {/if}
 </div>
 <div>&nbsp;</div>

diff --git a/views/admin/registrations/eventRegistrants.html b/views/admin/registrations/eventRegistrants.html
index fafe76b..a28149c 100644 (file)
--- a/views/admin/registrations/eventRegistrants.html
+++ b/views/admin/registrations/eventRegistrants.html
@@ -39,7 +39,7 @@
 
 <div class="glm-admin-table-inner glm-admin-table">
 
-    <p><b>Total found:</b> {$registrantCount}&nbsp;&nbsp;</p>
+    <p><b>Total found:</b> {if $haveRegistrants}{$registrantCount}{else}(none){/if}&nbsp;&nbsp;</p>
 
     {if $paging}
     <form method="post" action="{$thisUrl}?page={$thisPage}">