From 74a6281eeac993941ac3651509a813b2abfd9a8c Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Sat, 31 May 2014 12:29:53 +1000
Subject: [PATCH] Separate email definitions

---
 booking.rooms.inc  |  2 ++
 booking.tokens.inc | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/booking.rooms.inc b/booking.rooms.inc
index 04ef545..fc2546c 100644
--- a/booking.rooms.inc
+++ b/booking.rooms.inc
@@ -54,6 +54,7 @@ function booking_roomallocations_view_summary() {
 		'booking_lastname' => array('data' => t('Last Name'), 'field' => 'p.booking_lastname', 'sort' => 'asc'),
 		'booking_gender' => array('data' => t('Gender'), 'field' => 'p.booking_gender'),
 		'booking_age' => array('data' => t('Age'), 'field' => 'p.booking_dob'),
+		'booking_married' => array('data' => t('Married?'), 'field' => 'p.booking_married'),
 		'booking_roomlocation' => array('data' => t('Room Location'), 'field' => 'r.booking_room_location_id'),
 		'booking_room_num' => array('data' => t('Room Number'), 'field' => 'r.booking_room_number'),
 		'booking_room_bedtype' => array('data' => t('Bed Type'), 'field' => 'm.booking_room_bedtype')
@@ -78,6 +79,7 @@ function booking_roomallocations_view_summary() {
 				$data->booking_lastname,
 				$data->booking_gender == 'M' ? 'Male' : 'Female',
 				_booking_get_age_years($data->booking_dob),
+				$data->booking_married == 'Y' ? 'Yes' : 'No',
 				_booking_room_location_lookup($data->booking_room_location_id),
 				$data->booking_room_number,
 				_booking_room_bedtype_lookup($data->booking_room_bedtype),
diff --git a/booking.tokens.inc b/booking.tokens.inc
index d168a83..42636c1 100644
--- a/booking.tokens.inc
+++ b/booking.tokens.inc
@@ -323,7 +323,7 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 	/*Text for emails*/
 	$form['emails'] = array(
 		'#type' => 'fieldset',
-		'#title' => 'Email Text Definitions',
+		'#title' => 'Builtin Email Text Definitions',
 		'#collapsible' => TRUE, 
 		'#collapsed' => TRUE,
 	);	
@@ -408,20 +408,28 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
 		'#description' => t(''),
 		'#default_value' => variable_get('booking_email_missedpayment', ''),
 	);		
+
+	/*Text for emails*/
+	$form['custom-emails'] = array(
+		'#type' => 'fieldset',
+		'#title' => 'Custom Email Text Definitions',
+		'#collapsible' => TRUE, 
+		'#collapsed' => TRUE,
+	);
 	
 	//add a bunch of custom emails
 	for ($i = 1; $i <= variable_get('booking_custom_email_count','5'); $i++)
 	{
 		$subject_fieldname = 'booking_email_subject_custom' . $i;
 		$body_fieldname = 'booking_email_custom' . $i;
-		$form['emails'][$subject_fieldname] = array (
+		$form['custom-emails'][$subject_fieldname] = array (
 			'#type' => 'textfield',
 			'#title' => t('Subject line for Custom Email ' . $i),
 			'#size' => 150,	
 			'#maxlength' => 300,
 			'#default_value' => variable_get($subject_fieldname,'[booking:eventname]'),
 		);
-		$form['emails'][$body_fieldname] = array(
+		$form['custom-emails'][$body_fieldname] = array(
 			'#title' => t('Email text for custom email ' . $i),
 			'#type' => 'textarea',
 			'#description' => t(''),