drupal/booking
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

minor updates

Browse Source
This commit is contained in:
Nathan Coad
2016-06-03 13:05:05 +10:00
parent a2a81303be
commit 17076469de
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
booking.emails_admin.inc
View File

@@ -284,8 +284,9 @@ function booking_manual_email_form($form, &$form_state)
$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'; $email_options_array['travelcomplete'] = 'Travel Form Complete Email';
$preselection_options['---'] = "---"; $preselection_options['---'] = "---";
$preselection_options['bookedin'] = 'Status of Booked-in'; $preselection_options['bookedin'] = 'People who are booked-in';
$preselection_options['unpaid'] = 'Booked-in people with outstanding balance'; $preselection_options['unpaid'] = 'People booked-in with outstanding balance';
$preselection_options['notravelform'] = "People who haven't submitted travel form";
$preselection_options['test'] = 'Testing'; $preselection_options['test'] = 'Testing';
$header = array( $header = array(
@@ -310,7 +311,8 @@ function booking_manual_email_form($form, &$form_state)
//add in the custom email types from logistics //add in the custom email types from logistics
for ($i = 1; $i <= 5; $i++) 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 //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; break;
case 'unpaid': 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; $defaults[] = $person->nid;
} }
break; break;
case 'notravelform':
if ($person->tid == 0) {
$defaults[] = $person->nid;
}
break;
case 'test': case 'test':
if ($person->booking_lastname == 'Coad') { if ($person->booking_lastname == 'Coad') {
$defaults[] = $person->nid; $defaults[] = $person->nid;

1
booking.travel.inc
View File

@@ -24,7 +24,6 @@ function booking_travel_page()
return ""; return "";
} }
//work out the node id from the session id //work out the node id from the session id
$query = db_select('booking_person', 'p'); $query = db_select('booking_person', 'p');
$query->condition('p.booking_tempid', arg(1), '=') $query->condition('p.booking_tempid', arg(1), '=')