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

Update passport validation and date parse routine for data import

Browse Source
This commit is contained in:
Nathan Coad
2014-11-29 16:49:57 +11:00
parent cefdfd3afc
commit e5b825b837
4 changed files with 193 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
booking.register.inc
View File

@@ -367,174 +367,6 @@ function booking_form($node, &$form_state, $inserting = FALSE) {
);
} //end not-inserting check
if (variable_get('booking_enable_passport', 0) == 1)
{
$form['passport-details'] = array(
'#type' => 'fieldset',
'#title' => 'Passport Details',
);
$form['passport-details']['booking_passport_num'] = array(
'#type' => 'textfield',
'#title' => t('Passport Number'),
'#maxlength' => 45,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_num) ? $data->booking_passport_num : ''
);
$form['passport-details']['booking_passport_issue_location'] = array(
'#type' => 'textfield',
'#title' => t('City of Issue (eg Sydney)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_issue_location) ? $data->booking_passport_issue_location : ''
);
$form['passport-details']['booking_passport_issue_name'] = array(
'#type' => 'textfield',
'#title' => t('Exact name as listed on passport'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_issue_name) ? $data->booking_passport_issue_name : ''
);
$form['passport-details']['booking_passport_expiry_date'] = array(
'#type' => 'date_select',
'#title' => t('Passport expiry date'),
'#default_value' => empty($data->booking_passport_expiry_date) ? '' : date("Y-m-d H:i:s", $data->booking_passport_expiry_date),
'#required' => FALSE,
'#date_format' => 'd/m/Y',
//'#date_label_position' => 'within',
'#date_year_range' => '+0:+13'
);
$form['passport-details']['booking_travel_insurance'] = array(
'#type' => 'textfield',
'#title' => t('Travel insurance policy details'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_travel_insurance) ? $data->booking_travel_insurance : ''
);
if ($inserting == FALSE)
{
$form['passport-details']['booking_destination_country'] = array(
'#type' => 'textfield',
'#title' => t('Which country is this person going to?'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_destination_country) ? $data->booking_destination_country : '',
);
//flights from the conference week to the destination country
$form['outbound-flight-details'] = array(
'#type' => 'fieldset',
'#title' => 'Flight Details (Conference To Destination Country)',
);
$form['outbound-flight-details']['booking_outflight_bookingnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Booking Reference (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_bookingnum) ? $data->booking_outflight_bookingnum : '',
);
$form['outbound-flight-details']['booking_outflight_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Number (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_flightnum) ? $data->booking_outflight_flightnum : '',
);
$form['outbound-flight-details']['booking_outflight_origin'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Origin to Destination (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_origin) ? $data->booking_outflight_origin : '',
);
$form['outbound-flight-details']['booking_outflight_origin_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight departure time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_outflight_origin_ts) ? '' : date("Y-m-d H:i:s", $data->booking_outflight_origin_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
$form['outbound-flight-details']['booking_outflight_connecting_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Number (if applicable)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_connecting_flightnum) ? $data->booking_outflight_connecting_flightnum : '',
);
$form['outbound-flight-details']['booking_outflight_destination'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Origin to Destination'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_destination) ? $data->booking_outflight_destination : '',
);
$form['outbound-flight-details']['booking_outflight_destination_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight arrival time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_outflight_destination_ts) ? '' : date("Y-m-d H:i:s", $data->booking_outflight_destination_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
//flights from the destination country back to conference
$form['inbound-flight-details'] = array(
'#type' => 'fieldset',
'#title' => 'Flight Details (Destination Country Back To Conference)',
);
$form['inbound-flight-details']['booking_rtrnflight_bookingnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Booking Reference (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_bookingnum) ? $data->booking_rtrnflight_bookingnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Number (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_flightnum) ? $data->booking_rtrnflight_flightnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_origin'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Origin to Destination (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_origin) ? $data->booking_rtrnflight_origin : '',
);
$form['inbound-flight-details']['booking_rtrnflight_origin_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight departure time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_rtrnflight_origin_ts) ? '' : date("Y-m-d H:i:s", $data->booking_rtrnflight_origin_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
$form['inbound-flight-details']['booking_rtrnflight_connecting_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Number (if applicable)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_connecting_flightnum) ? $data->booking_rtrnflight_connecting_flightnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_destination'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Origin to Destination'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_destination) ? $data->booking_rtrnflight_destination : '',
);
$form['inbound-flight-details']['booking_rtrnflight_destination_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight arrival time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_rtrnflight_destination_ts) ? '' : date("Y-m-d H:i:s", $data->booking_rtrnflight_destination_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
}
} //end passport only fields
$form['contact-details'] = array(
'#type' => 'fieldset',
@@ -677,6 +509,175 @@ function booking_form($node, &$form_state, $inserting = FALSE) {
'#default_value' => empty($data->booking_medicare) ? '' : $data->booking_medicare
);
}
if (variable_get('booking_enable_passport', 0) == 1)
{
$form['passport-details'] = array(
'#type' => 'fieldset',
'#title' => 'Passport Details',
);
$form['passport-details']['booking_passport_num'] = array(
'#type' => 'textfield',
'#title' => t('Passport Number'),
'#maxlength' => 45,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_num) ? $data->booking_passport_num : ''
);
$form['passport-details']['booking_passport_issue_location'] = array(
'#type' => 'textfield',
'#title' => t('City of Issue (eg Sydney)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_issue_location) ? $data->booking_passport_issue_location : ''
);
$form['passport-details']['booking_passport_issue_name'] = array(
'#type' => 'textfield',
'#title' => t('Exact name as listed on passport'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_passport_issue_name) ? $data->booking_passport_issue_name : ''
);
$form['passport-details']['booking_passport_expiry_date'] = array(
'#type' => 'date_select',
'#title' => t('Passport expiry date'),
'#default_value' => empty($data->booking_passport_expiry_date) ? '' : date("Y-m-d H:i:s", $data->booking_passport_expiry_date),
'#required' => FALSE,
'#date_format' => 'd/m/Y',
//'#date_label_position' => 'within',
'#date_year_range' => '+0:+13'
);
$form['passport-details']['booking_travel_insurance'] = array(
'#type' => 'textfield',
'#title' => t('Travel insurance policy details'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_travel_insurance) ? $data->booking_travel_insurance : ''
);
if ($inserting == FALSE)
{
$form['passport-details']['booking_destination_country'] = array(
'#type' => 'textfield',
'#title' => t('Which country is this person going to?'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_destination_country) ? $data->booking_destination_country : '',
);
//flights from the conference week to the destination country
$form['outbound-flight-details'] = array(
'#type' => 'fieldset',
'#title' => 'Flight Details (Conference To Destination Country)',
);
$form['outbound-flight-details']['booking_outflight_bookingnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Booking Reference (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_bookingnum) ? $data->booking_outflight_bookingnum : '',
);
$form['outbound-flight-details']['booking_outflight_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Number (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_flightnum) ? $data->booking_outflight_flightnum : '',
);
$form['outbound-flight-details']['booking_outflight_origin'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Origin to Destination (departing conference week)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_origin) ? $data->booking_outflight_origin : '',
);
$form['outbound-flight-details']['booking_outflight_origin_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight departure time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_outflight_origin_ts) ? '' : date("Y-m-d H:i:s", $data->booking_outflight_origin_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
$form['outbound-flight-details']['booking_outflight_connecting_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Number (if applicable)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_connecting_flightnum) ? $data->booking_outflight_connecting_flightnum : '',
);
$form['outbound-flight-details']['booking_outflight_destination'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Origin to Destination'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_outflight_destination) ? $data->booking_outflight_destination : '',
);
$form['outbound-flight-details']['booking_outflight_destination_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight arrival time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_outflight_destination_ts) ? '' : date("Y-m-d H:i:s", $data->booking_outflight_destination_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
//flights from the destination country back to conference
$form['inbound-flight-details'] = array(
'#type' => 'fieldset',
'#title' => 'Flight Details (Destination Country Back To Conference)',
);
$form['inbound-flight-details']['booking_rtrnflight_bookingnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Booking Reference (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_bookingnum) ? $data->booking_rtrnflight_bookingnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Number (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_flightnum) ? $data->booking_rtrnflight_flightnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_origin'] = array(
'#type' => 'textfield',
'#title' => t('Internal Flight Origin to Destination (returning to conference)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_origin) ? $data->booking_rtrnflight_origin : '',
);
$form['inbound-flight-details']['booking_rtrnflight_origin_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight departure time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_rtrnflight_origin_ts) ? '' : date("Y-m-d H:i:s", $data->booking_rtrnflight_origin_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
$form['inbound-flight-details']['booking_rtrnflight_connecting_flightnum'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Number (if applicable)'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_connecting_flightnum) ? $data->booking_rtrnflight_connecting_flightnum : '',
);
$form['inbound-flight-details']['booking_rtrnflight_destination'] = array(
'#type' => 'textfield',
'#title' => t('Connecting Flight Origin to Destination'),
'#maxlength' => 120,
'#required' => FALSE,
'#default_value' => !empty($data->booking_rtrnflight_destination) ? $data->booking_rtrnflight_destination : '',
);
$form['inbound-flight-details']['booking_rtrnflight_destination_ts'] = array(
'#type' => 'date_select',
'#title' => t('Internal flight arrival time (local timezone)'),
'#description' => t('Note: 24 hour time - 12:00 is midday'),
'#default_value' => empty($data->booking_rtrnflight_destination_ts) ? '' : date("Y-m-d H:i:s", $data->booking_rtrnflight_destination_ts),
'#date_format' => 'd/m/Y H:i',
'#date_year_range' => '0:+1',
);
}
} //end passport only fields
if (variable_get('booking_enable_helpareas', 1) == 1)
{
@@ -1856,6 +1857,7 @@ function booking_view($node, $view_mode) {
$rows[] = array(t('Payment Type Selected:'), t('!amount_paid', array('!amount_paid' => $payment_type)));
$rows[] = array(t('Amount Paid:'), t('!amount_paid', array('!amount_paid' => $node->booking_amount_paid)));
$rows[] = array(t('Payment Complete Flag:'), t('!ans', array('!ans' => $node->booking_payment_complete == 'Y' ? 'Yes' : 'No')));
$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'))));