diff --git a/booking.helper.inc b/booking.helper.inc index ee35b5a..968a7b3 100644 --- a/booking.helper.inc +++ b/booking.helper.inc @@ -1162,8 +1162,7 @@ function _booking_details_email_summary($node) { $rows[] = t('Gender: !gender', array('!gender' => $node->booking_gender == 'M' ? 'Male' : 'Female')); $rows[] = t('Date of birth: !dob', array('!dob' => _booking_convert_ts($node->booking_dob)->format('d/m/Y'))); - if (variable_get('booking_enable_passport', 1) == 1) - { + if (variable_get('booking_enable_passport', 1) == 1) { $rows[] = t('Passport Number: !value', array('!value' => $node->booking_passport_num)); $rows[] = t('Passport Expiry: !timestamp', array('!timestamp' => _booking_convert_ts($node->booking_passport_expiry_date)->format('d/m/Y'))); $rows[] = t('Passport Exact Issued Name: !value', array('!value' => $node->booking_passport_issue_name)); @@ -1179,26 +1178,30 @@ function _booking_details_email_summary($node) { '!country' => $node->booking_country)); $rows[] = t('Ecclesia: !ecclesia', array('!ecclesia' => $node->booking_ecclesia)); $rows[] = t('Baptised: !ans', array('!ans' => ($node->booking_baptised == 'Y' ? 'Yes' : 'No'))); - $rows[] = t('Married: !ans', array('!ans' => ($node->booking_married == 'Y' ? 'Yes' : 'No'))); - $rows[] = t("If married, attending partner's name: !name", array('!name' => $node->booking_partner_name)); - if (variable_get('booking_enable_tshirts', 1) == 1) - $rows[] = t('Hoodie Size: !size', array('!size' => $node->booking_shirt_size)); + if (variable_get('booking_allow_couples', 1) == 1) { + $rows[] = t('Married: !ans', array('!ans' => ($node->booking_married == 'Y' ? 'Yes' : 'No'))); + $rows[] = t("If married, attending partner's name: !name", array('!name' => $node->booking_partner_name)); + } + + if (variable_get('booking_enable_tshirts', 1) == 1) { + $rows[] = t('Hoodie Size: !size', array('!size' => $node->booking_shirt_size)); + } $rows[] = t('Emergency Contact Name: !contact', array('!contact' => $node->booking_guardian_name)); $rows[] = t('Emergency Contact Relationship: !relationship', array('!relationship' => $node->booking_guardian_type)); $rows[] = t('Emergency Contact Phone: !phone', array('!phone' => $node->booking_guardian_phone)); $rows[] = t('Emergency Contact Alternate Phone: !phone', array('!phone' => $node->booking_guardian_phone_alt)); - if (variable_get('booking_enable_medicare', 1) == 1) - $rows[] = t('Medicare Number: !medicare', array('!medicare' => $node->booking_medicare)); - if (variable_get('booking_enable_roommate', 0) == 1) - { + if (variable_get('booking_enable_medicare', 1) == 1) { + $rows[] = t('Medicare Number: !medicare', array('!medicare' => $node->booking_medicare)); + } + + if (variable_get('booking_enable_roommate', 0) == 1) { $rows[] = t('Preferred room-mates: !room', array('!room' => $node->booking_room_mate1 . ' ' . $node->booking_room_mate2)); } - if (variable_get('booking_enable_helpareas', 1) == 1) - { + if (variable_get('booking_enable_helpareas', 1) == 1) { $help_areas = ''; if ($node->booking_help_music) $help_areas .= 'music: ' . $node->booking_help_music . ', '; @@ -1218,8 +1221,7 @@ function _booking_details_email_summary($node) { $rows[] = t('Help areas: !help', array('!help' => $help_areas)); } - if (variable_get('booking_enable_skills', 1) == 1) - { + if (variable_get('booking_enable_skills', 1) == 1) { $skill_areas = ''; if ($node->booking_skills_builder == 'Y') $skill_areas .= 'builder, '; @@ -1234,6 +1236,7 @@ function _booking_details_email_summary($node) { $rows[] = t('Mission related skills: !value', array('!value' => $skill_areas)); $rows[] = t('Previous Mission Experience: !value', array('!value' => $node->booking_mission_experience_details)); } + $rows[] = t('Special Dietary Requirements: !dietary', array('!dietary' => $node->booking_dietary)); $rows[] = t('Special Medical Conditions: !medical', array('!medical' => $node->booking_medical_conditions)); $rows[] = t('Gross Amount Paid: !payment', array('!payment' => $node->booking_amount_paid));