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

Travel form bugfixes

Browse Source
This commit is contained in:
Nathan Coad
2014-02-15 21:27:58 +11:00
parent 01da63e694
commit 5e88777054
4 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
booking.travel.inc
View File

@@ -16,11 +16,18 @@ function booking_travel_page() {
}
//fetch details about the person
/*
$person = db_query("SELECT * FROM {booking_person} " .
"WHERE booking_tempid = :tempid ",
array(':tempid' => arg(1)))
->fetchObject();
*/
$person = db_query("SELECT p.*, t.* from {booking_person} p " .
"left outer join {booking_travel} t on p.nid = t.booking_person_nid " .
"where p.booking_event_id = :eid AND p.booking_tempid = :tempid",
array(':tempid' => arg(1), ':eid' => $event->eid))
->fetchObject();
if ($person)
{
$tokens = booking_define_personspecific_tokens($person);
@@ -36,26 +43,26 @@ function booking_travel_page() {
if ($travelform)
{
/*
$output .= t("<p><br />Hi !firstname !lastname. Our records indicate you or your spouse have already completed the travel details form for !event. " .
"Please contact us if you need change any of your travel details.</p>",
array('!firstname' => $person->booking_firstname, '!lastname' => $person->booking_lastname, '!event' => $event->booking_eventname));
*/
$output = token_replace(variable_get('booking_travelform_completed_page'), $tokens);
$return_array[] = array('paragraph' => array('#type' => 'markup', '#markup' => $output));
}
//they haven't submitted a travel form yet
else
{
$output = token_replace(variable_get('booking_travelform_page'), $tokens);
//check for married couple
//if ($person->booking_partner_id > 0) {
// $output .= t("<p><br />Hi Mr and Mrs !lastname. Please enter your travel details for !event below.</p>",
// array('!lastname' => $person->booking_lastname, '!event' => $event->booking_eventname));
//}
//else {
// $output .= t("<p><br />Hi !firstname !lastname. Please enter your travel details for !event below.</p>",
// array('!firstname' => $person->booking_firstname, '!lastname' => $person->booking_lastname, '!event' => $event->booking_eventname));
//}
//Output different text if this is for a married couple
if ((variable_get('booking_enable_combined_pricing', 0) == 1) && $person->booking_partner_id > 0)
{
$output = token_replace(variable_get('booking_travelform_married_page'), $tokens);
}
else
{
$output = token_replace(variable_get('booking_travelform_page'), $tokens);
}
$return_array[] = array('paragraph' => array('#type' => 'markup', '#markup' => $output));
$return_array[] = array('form' => drupal_get_form('travel_form', true, $person->nid));