From b175f1cc2473a1a81331339c013e5e10fedb08cb Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Thu, 23 Jun 2016 22:00:13 +1000 Subject: [PATCH] rearrange fields booking node theming --- booking.regn_node.inc | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/booking.regn_node.inc b/booking.regn_node.inc index e5a2e01..702322c 100644 --- a/booking.regn_node.inc +++ b/booking.regn_node.inc @@ -738,6 +738,8 @@ function booking_view($node, $view_mode) { $rows[] = array(t('Committee Member:'), t('!ans', array('!ans' => ($node->booking_committee_member == 'Y' ? 'Yes' : 'No')))); $rows[] = array(t('Welfare Required:'), $node->booking_welfare_required == 'Y' ? 'Yes' : 'No'); $rows[] = array(t('Barcode:'), t('!id', array('!id' => $node->booking_barcode))); + $rows[] = array(t('Lanyard lucky number:'), $node->booking_luckynum); + $rows[] = array(t('Reading Group:'), t('!group', array('!group' => $node->booking_readinggroup))); $rows[] = array(t('Date of birth:'), t('!dob', array('!dob' => format_date($node->booking_dob, 'custom', 'd/m/Y')))); $rows[] = array(t('Email address:'), t('!email', array('!email' => $node->booking_email))); $rows[] = array(t('Payment Type Selected:'), t('!amount_paid', array('!amount_paid' => $payment_type))); @@ -746,13 +748,19 @@ function booking_view($node, $view_mode) { $rows[] = array(t('Total Amount Due:'), t('!amount_paid', array('!amount_paid' => $node->booking_total_pay_reqd))); $rows[] = array(t('Refund Due:'), t('!amount_due', array('!amount_due' => $node->booking_refund_due))); $rows[] = array(t('Refund Processed:'), t('!ans', array('!ans' => ($node->booking_refund_processed == 'Y' ? 'Yes' : 'No')))); - $rows[] = array(t('Reading Group:'), t('!group', array('!group' => $node->booking_readinggroup))); $rows[] = array(t('Random Facts:'), t('!facts', array('!facts' => $node->booking_random_facts))); if (variable_get('booking_enable_tshirts', 0) == 1) { $rows[] = array(t('Hoodie Size:'), $node->booking_shirt_size); } - + $rows[] = array(t('Ecclesia:'), t('!ecclesia', array('!ecclesia' => $node->booking_ecclesia))); + $rows[] = array(t('Baptised:'), t('!ans', array('!ans' => ($node->booking_baptised == 'Y' ? 'Yes' : 'No')))); + $rows[] = array(t('Married:'), t('!ans', array('!ans' => ($node->booking_married == 'Y' ? 'Yes' : 'No')))); + if (variable_get('booking_ask_dependant_children', 0) == 1) { + $rows[] = array(t('Bringing dependant children:'), t('!ans', array('!ans' => ($node->booking_dependant_children == 'Y' ? 'Yes' : 'No')))); + } + $rows[] = array(t('Linked Partner:'), t($partner_name)); + $rows[] = array(t('Linked Boyfriend/Girlfriend:'), t($bf_gf)); $rows[] = array(t('Home Phone Number:'), t('!home', array('!home' => $node->booking_phone))); $rows[] = array(t('Mobile Phone Number:'), t('!mob', array('!mob' => $node->booking_mobile))); $rows[] = array(t('Postal Address:'), t('!street
!suburb !state !code
!country', @@ -760,21 +768,13 @@ function booking_view($node, $view_mode) { '!state' => ($node->booking_state == 'N/A' ? '' : $node->booking_state), '!code' => $node->booking_postcode, '!country' => $node->booking_country))); - $rows[] = array(t('Ecclesia:'), t('!ecclesia', array('!ecclesia' => $node->booking_ecclesia))); - $rows[] = array(t('Baptised:'), t('!ans', array('!ans' => ($node->booking_baptised == 'Y' ? 'Yes' : 'No')))); - $rows[] = array(t('Married:'), t('!ans', array('!ans' => ($node->booking_married == 'Y' ? 'Yes' : 'No')))); - - if (variable_get('booking_ask_dependant_children', 0) == 1) { - $rows[] = array(t('Bringing dependant children:'), t('!ans', array('!ans' => ($node->booking_dependant_children == 'Y' ? 'Yes' : 'No')))); - } - - $rows[] = array(t('Linked Partner:'), t($partner_name)); - $rows[] = array(t('Linked Boyfriend/Girlfriend:'), t($bf_gf)); + $rows[] = array(t('Emergency Contact Name:'), $node->booking_guardian_name); $rows[] = array(t('Emergency Contact Relationship:'), $node->booking_guardian_type); $rows[] = array(t('Emergency Contact Email Address:'), $node->booking_guardian_email); $rows[] = array(t('Emergency Contact Phone:'), $node->booking_guardian_phone); $rows[] = array(t('Emergency Contact Alternate Phone:'), $node->booking_guardian_phone_alt); + if (variable_get('booking_enable_medicare', 1) == 1) { $rows[] = array(t('Medicare Number:'), $node->booking_medicare); } @@ -825,7 +825,6 @@ function booking_view($node, $view_mode) { $rows[] = array(t('Previous Mission Experience:'), $node->booking_mission_experience_details); } $rows[] = array(t('Temporary UUID:'), $node->booking_tempid); - $rows[] = array(t('Lanyard lucky number:'), $node->booking_luckynum); //display room allocation data if enabled if (variable_get('booking_enable_roomallocations', 0) == 1) {