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

fixes for booking_late_price not existing when node is first created

Browse Source
This commit is contained in:
Nathan Coad
2016-04-28 22:39:06 +10:00
parent c1b2621d3b
commit cd10d60f1b
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
booking.helper.inc
View File

@@ -190,6 +190,7 @@ function _booking_change_status($nid, $status_id)
function _datearray_to_ts($date) function _datearray_to_ts($date)
{ {
watchdog('booking', 'Date Conversion: @info', array('@info' => var_export($date, TRUE)));
date_default_timezone_set(date_default_timezone(FALSE)); date_default_timezone_set(date_default_timezone(FALSE));
$tz = new DateTimeZone(date_default_timezone(FALSE)); $tz = new DateTimeZone(date_default_timezone(FALSE));
@@ -208,7 +209,7 @@ function _datearray_to_ts($date)
function _datetime_array_to_ts($date) function _datetime_array_to_ts($date)
{ {
//watchdog('booking', 'Date-time Conversion: @info', array('@info' => var_export($date, TRUE))); watchdog('booking', 'Date-time Conversion: @info', array('@info' => var_export($date, TRUE)));
//watchdog('booking', "Date time conversion timezone configured as: @info", array('@info' => date_default_timezone(FALSE))); //watchdog('booking', "Date time conversion timezone configured as: @info", array('@info' => date_default_timezone(FALSE)));
date_default_timezone_set(date_default_timezone(FALSE)); date_default_timezone_set(date_default_timezone(FALSE));
$tz = new DateTimeZone(date_default_timezone(FALSE)); $tz = new DateTimeZone(date_default_timezone(FALSE));
@@ -993,6 +994,7 @@ function _booking_amount_paid($nid, $person = NULL)
*/ */
function _booking_total_due($person) function _booking_total_due($person)
{ {
//watchdog('booking', "<pre>_booking_total_due person:\n @info</pre>", array('@info' => print_r( $person, true)));
$total_due = 0.00; $total_due = 0.00;
//check for a spouse //check for a spouse
@@ -1018,8 +1020,20 @@ function _booking_total_due($person)
//finally we must be in the late-fee period //finally we must be in the late-fee period
else else
{ {
$total_due = $person->booking_late_price; //when first creating this node the price information won't all exist
} //since we combine that with the booking_person table in the hook for node_load
if (!isset($person->booking_late_price)) {
//query the database based on the payment_id that is set when we first create the node
$query = db_select('booking_price', 'p');
$query->condition('p.pid', $person->booking_payment_id, '=')
->fields('p');
$result = $query->execute()->fetchObject();
//set the result
$total_due = $result->booking_late_price;
} else {
$total_due = $person->booking_late_price;
}
} //end payment type conditional
return $total_due; return $total_due;
} }

7
booking.regn_form.inc
View File

@@ -1069,15 +1069,16 @@ if (variable_get('booking_enable_passport', 0) == 1)
function booking_form_validate($form, &$form_state) { function booking_form_validate($form, &$form_state) {
return _booking_validate($form_state['values']['form_id'], $form_state['values']); return _booking_validate($form_state['values']['form_id'], $form_state['input']);
} }
function _booking_validate($node, &$form_state) { function _booking_validate($node, &$form_state) {
global $event; global $event;
//watchdog('booking', '<pre>Booking registration form validation:\n@info</pre>', array('@info' => print_r( $form_state, true)));
//in case the date of birth field hasn't been filled out //in case the date of birth field hasn't been filled out
//watchdog('booking', 'Blank date of birth checking: @info', array('@info' => var_export($form_state['booking_dob'], TRUE))); watchdog('booking', 'Blank date of birth checking: @info', array('@info' => var_export($form_state['booking_dob'], TRUE)));
$dob_check = $form_state['booking_dob']['day'] != '' && $form_state['booking_dob']['month'] != '' && $form_state['booking_dob']['year'] != '' ? _date_to_ts($form_state['booking_dob']) : 0; $dob_check = $form_state['booking_dob']['day'] != '' && $form_state['booking_dob']['month'] != '' && $form_state['booking_dob']['year'] != '' ? _datearray_to_ts($form_state['booking_dob']) : 0;
//Verify this is not a duplicate registration //Verify this is not a duplicate registration
//try and find the person in the database for this event //try and find the person in the database for this event