diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc index 4149fe1..803a538 100644 --- a/booking.emails_admin.inc +++ b/booking.emails_admin.inc @@ -280,7 +280,7 @@ function booking_manual_email_form($form, &$form_state, $input_option = "") $email_options_array['withdrawal'] = 'Withdrawal Processed Email'; $email_options_array['missedpayment'] = 'Missed Payment Email'; $email_options_array['initialtravelrequired'] = 'Initial Travel Form Required Email'; - $email_options_array['remindertravelrequired'] = 'Reminder Travel Form Required Email'; + $email_options_array['remindertravelrequired'] = 'Reminder Travel Form Required Email'; $email_options_array['travelcomplete'] = 'Travel Form Complete Email'; //add in the custom email types @@ -292,11 +292,18 @@ function booking_manual_email_form($form, &$form_state, $input_option = "") for ($i = 1; $i <= 5; $i++) { $email_options_array['customlogistics' . $i] = variable_get('booking_email_subject_customlogistics' . $i, $event->booking_eventname . ' logistics custom ' . $i); - } - + } + //add some indication of which people have been pre-selected, if any + if ($input_option == 'unpaid') { + $prefix .= t("

Pre-selecting people with outstanding payments.

"); + } + elseif ($input_option == 'bookedin') { + $prefix .= t("

Pre-selecting only people with a status of booked-in

"); + } + //attach css so we can customise colours for some people $form['#attached']['css'] = array( drupal_get_path('module', 'booking') . '/booking.css', - ); + ); $form['email-type'] = array( '#type' => 'select', @@ -373,12 +380,12 @@ function booking_manual_email_form($form, &$form_state, $input_option = "") } $options[$data->nid]['group_roles'] = $group_text; } + //handle any checkbox pre-selection for this attendee if ($input_option == 'unpaid') { $values[$data->nid] = ($data->booking_payment_complete == 'Y' || $data->booking_status != 1) ? FALSE : TRUE; - $prefix .= t("

Pre-selecting people with outstanding payments.

"); - } elseif ($input_option == 'bookedin') { + } + elseif ($input_option == 'bookedin') { $values[$data->nid] = $data->booking_status == 1 ? TRUE : FALSE; - $prefix .= t("

Pre-selecting only people with a status of booked-in

"); } }