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

Loads of changes

Browse Source
This commit is contained in:
Nathan Coad
2014-02-24 23:53:12 +11:00
parent 66d4c89679
commit b710954bdd
10 changed files with 357 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
booking.register.inc
View File

@@ -277,9 +277,7 @@ function booking_form($node, &$form_state, $inserting = FALSE) {
),
),
*/
'#title' => t('I have read and agree to the following aims and expectations.',
array('!event' => $event->booking_eventname)
),
'#title' => token_replace(variable_get('booking_registration_aims_rules_checkbox'), booking_define_tokens()),
'#description' => token_replace(variable_get('booking_registration_aims_rules_text'), booking_define_tokens())
);
}
@@ -899,25 +897,16 @@ function booking_form_submit($form, &$form_state) {
$node->booking_passport_num = empty($values['booking_passport_num']) ? '' : $values['booking_passport_num'];
$node->booking_passport_issue_location = empty($values['booking_passport_issue_location']) ? '' : $values['booking_passport_issue_location'];
$node->booking_passport_issue_name = empty($values['booking_passport_issue_name']) ? '' : $values['booking_passport_issue_name'];
$node->booking_passport_expiry_date = empty($values['booking_passport_expiry_date']) ? '0' : _datearray_to_ts($values['booking_passport_expiry_date']);
//calculate booking_payment_id based on form choice of student or worker
//$worker_type = db_result(db_query("SELECT pid FROM {booking_price} where booking_eventid = %d AND booking_price_descrip='%s'",
// EVENTID, $values['booking_worker_type'] ));
$node->booking_passport_expiry_date = empty($values['booking_passport_expiry_date']) ? '0' : _datearray_to_ts($values['booking_passport_expiry_date']);
//payment details
$node->booking_payment_id = $values['booking_payment_id'];
//contact details
$node->booking_street = ucwords($values['booking_street']);
$node->booking_suburb = ucwords($values['booking_suburb']);
$node->booking_postcode = $values['booking_postcode'];
$node->booking_country = $values['booking_country'];
//allow for user-entered value if the state is not already listed
if ($values['booking_state'] == 'Other') {
$node->booking_state = $values['booking_other_state'];
} else {
$node->booking_state = ucwords($values['booking_state']);
}
$node->booking_phone = $values['booking_phone'];
$node->booking_mobile = $values['booking_mobile'];
$node->booking_email = strtolower($values['booking_email']);
@@ -926,7 +915,13 @@ function booking_form_submit($form, &$form_state) {
$node->booking_married = ($values['booking_married'] == 1 ? 'Y' : 'N');
$node->booking_partner_name = ucwords($values['booking_partner_name']);
$node->booking_partner_id = empty($values['booking_partner_id']) ? 0 : $values['booking_partner_id'];
//allow for user-entered value if the state is not already listed
if ($values['booking_state'] == 'Other') {
$node->booking_state = $values['booking_other_state'];
} else {
$node->booking_state = ucwords($values['booking_state']);
}
//emergency contact info
$node->booking_guardian_name = $values['booking_guardian_name'];
$node->booking_guardian_type = $values['booking_guardian_type'];
@@ -959,7 +954,6 @@ function booking_form_submit($form, &$form_state) {
$node->booking_skills_other = empty($values['booking_skills_other']) ? 'N' : ($values['booking_skills_other'] == 1 ? 'Y' : 'N');
$node->booking_skills_other_details = empty($values['booking_skills_other_details']) ? 'N/A' : $values['booking_skills_other_details'];
//potential fields for future
//$node->booking_payment_method = $payment_method;
$node->booking_room_mate1 = empty($values['booking_room_mate1']) ? '' : $values['booking_room_mate1'];