From 17076469de6d558281dddd164eda90c6f1075159 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@cdc.home>
Date: Fri, 3 Jun 2016 13:05:05 +1000
Subject: [PATCH] minor updates

---
 booking.emails_admin.inc | 17 ++++++++++++-----
 booking.travel.inc       |  1 -
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 20c6bcb..31a0360 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -284,8 +284,9 @@ function booking_manual_email_form($form, &$form_state)
   $email_options_array['remindertravelrequired'] = 'Reminder Travel Form Required Email';
   $email_options_array['travelcomplete'] = 'Travel Form Complete Email';
   $preselection_options['---'] = "---";
-  $preselection_options['bookedin'] = 'Status of Booked-in';
-  $preselection_options['unpaid'] = 'Booked-in people with outstanding balance';
+  $preselection_options['bookedin'] = 'People who are booked-in';
+  $preselection_options['unpaid'] = 'People booked-in with outstanding balance';
+  $preselection_options['notravelform'] = "People who haven't submitted travel form";
   $preselection_options['test'] = 'Testing';
   
   $header = array(
@@ -310,7 +311,8 @@ function booking_manual_email_form($form, &$form_state)
   //add in the custom email types from logistics
   for ($i = 1; $i <= 5; $i++)
   {
-    $email_options_array['customlogistics' . $i] = variable_get('booking_email_subject_customlogistics' . $i, $event->booking_eventname . ' logistics custom ' . $i);
+    $email_options_array['customlogistics' . $i] = variable_get('booking_email_subject_customlogistics' . $i, 
+      $event->booking_eventname . ' logistics custom ' . $i) . " **Logistics**";
   }
   /*
   //add some indication of which people have been pre-selected, if any
@@ -500,10 +502,15 @@ function _booking_email_get_default_selection_callback($form, $form_state) {
         }
         break;
       case 'unpaid': 
-        if ($person->booking_payment_complete == 'Y' || $person->booking_status != 1) {
+        if ($person->booking_payment_complete == 'N' && $person->booking_status == 1) {
           $defaults[] = $person->nid;
         }
-        break;       
+        break;
+      case 'notravelform': 
+        if ($person->tid == 0) {
+          $defaults[] = $person->nid;
+        }
+        break;           
       case 'test':
         if ($person->booking_lastname == 'Coad') {
           $defaults[] = $person->nid;
diff --git a/booking.travel.inc b/booking.travel.inc
index 4527888..9ed28a9 100644
--- a/booking.travel.inc
+++ b/booking.travel.inc
@@ -24,7 +24,6 @@ function booking_travel_page()
     return "";
   }
   
-  
   //work out the node id from the session id
   $query = db_select('booking_person', 'p');
   $query->condition('p.booking_tempid', arg(1), '=')