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

minor tweaks

Browse Source
This commit is contained in:
Nathan Coad
2018-01-18 11:52:46 +11:00
parent fb7084012c
commit 584376bf25
2 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
booking.regn_form.inc
View File

@@ -968,6 +968,9 @@ function booking_form($node, &$form_state, $inserting = FALSE)
return $form;
}
/**
* Callback function to verify if an early access code was valid
*/
function booking_earlyaccess_feedback_callback($form, &$form_state) {
global $event;
//$node = $form_state['values']['form_id'];
@@ -1018,6 +1021,9 @@ function booking_earlyaccess_feedback_callback($form, &$form_state) {
'<p><strong>NOTE: each early-access code can only be used once, so don\'t pass it along to your friends!</strong></p></div>';
}
/**
* Run a number of checks to validate user input
*/
function booking_form_validate($form, &$form_state) {
global $event;
$node = $form_state['values']['form_id'];
@@ -1217,7 +1223,9 @@ function booking_form_validate($form, &$form_state) {
}
}
/**
* Create the new node for this booking
*/
function booking_form_submit($form, &$form_state)
{
global $event;
@@ -1273,33 +1281,7 @@ function booking_form_submit($form, &$form_state)
$node->booking_gender = $values['booking_gender'];
$node->booking_dob = $dob;
$node->booking_status = 0; //zero means not yet coming. Only change to 1 when a payment is made
//passport details
/*
$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']);
$node->booking_destination_country = empty($values['booking_destination_country']) ? '' : $values['booking_destination_country'];
$node->booking_travel_insurance = empty($values['booking_travel_insurance']) ? '' : $values['booking_travel_insurance'];
//flight info, which may not be present
$node->booking_outflight_bookingnum = empty($values['booking_outflight_bookingnum']) ? '' : $values['booking_outflight_bookingnum'];
$node->booking_outflight_flightnum = empty($values['booking_outflight_flightnum']) ? '' : $values['booking_outflight_flightnum'];
$node->booking_outflight_origin = empty($values['booking_outflight_origin']) ? '' : $values['booking_outflight_origin'];
$node->booking_outflight_origin_ts = empty($values['booking_outflight_origin_ts']) ? '0' : _datetime_array_to_ts($values['booking_outflight_origin_ts']);
$node->booking_outflight_connecting_flightnum = empty($values['booking_outflight_connecting_flightnum']) ? '' : $values['booking_outflight_connecting_flightnum'];
$node->booking_outflight_destination = empty($values['booking_outflight_destination']) ? '' : $values['booking_outflight_destination'];
$node->booking_outflight_destination_ts = empty($values['booking_outflight_destination_ts']) ? '0' : _datetime_array_to_ts($values['booking_outflight_destination_ts']);
$node->booking_rtrnflight_bookingnum = empty($values['booking_rtrnflight_bookingnum']) ? '' : $values['booking_rtrnflight_bookingnum'];
$node->booking_rtrnflight_flightnum = empty($values['booking_rtrnflight_flightnum']) ? '' : $values['booking_rtrnflight_flightnum'];
$node->booking_rtrnflight_origin = empty($values['booking_rtrnflight_origin']) ? '' : $values['booking_rtrnflight_origin'];
$node->booking_rtrnflight_origin_ts = empty($values['booking_rtrnflight_origin_ts']) ? '0' : _datetime_array_to_ts($values['booking_rtrnflight_origin_ts']);
$node->booking_rtrnflight_connecting_flightnum = empty($values['booking_rtrnflight_connecting_flightnum']) ? '' : $values['booking_rtrnflight_connecting_flightnum'];
$node->booking_rtrnflight_destination = empty($values['booking_rtrnflight_destination']) ? '' : $values['booking_rtrnflight_destination'];
$node->booking_rtrnflight_destination_ts = empty($values['booking_rtrnflight_destination_ts']) ? '0' : _datetime_array_to_ts($values['booking_rtrnflight_destination_ts']);
*/
//payment details
$node->booking_payment_id = $values['booking_payment_id'];

5
booking.regn_node.inc
View File

@@ -450,8 +450,9 @@ function booking_update($node) {
}
//make sure the name is the correct case
$data['booking_firstname'] = _booking_ucname($data['booking_firstname']);
$data['booking_lastname'] = _booking_ucname($data['booking_lastname']);
//not really needed for node updates since it now applies at node creation
//$data['booking_firstname'] = _booking_ucname($data['booking_firstname']);
//$data['booking_lastname'] = _booking_ucname($data['booking_lastname']);
watchdog('booking', 'Updating node: @info', array('@info' => var_export($data, TRUE)));
db_update('booking_person')->fields($data)->condition('nid', $node->nid)->execute();