diff --git a/.idea/booking.iml b/.idea/booking.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/booking.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e18ec86 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..e96718f --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1479362968746 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc index ca180f2..540a133 100644 --- a/booking.emails_admin.inc +++ b/booking.emails_admin.inc @@ -318,7 +318,6 @@ function booking_manual_email_form($form, &$form_state) 'amount_reqd' => array('data' => t('Total Payment Required'), 'field' => 'booking_total_pay_reqd'), 'booking_fully_paid' => array('data' => t('Fully paid?'), 'field' => 'booking_payment_complete'), 'welfare_required' => array('data' => t('Welfare Required?'), 'field' => 'booking_welfare_required'), - 'travel_form' => array('data' => t('Travel Submitted?'), 'field' => 'tid'), ); //add in the custom email types @@ -392,6 +391,11 @@ function booking_manual_email_form($form, &$form_state) '#type' => 'submit', '#value' => t('Send Email'), ); + + if (variable_get('booking_enable_travelform', 0) == 1) { + $header['travel_form'] = array('data' => t('Travel Submitted?'), 'field' => 'tid'); + } + //query the database for studygroup info if it is enabled if (variable_get('booking_enable_studygroups', 0) == 1)