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

update

Browse Source 
Merge branch 'master' of gitlab.coadcorp.com:drupal/booking
This commit is contained in:
Nathan Coad
2016-05-10 23:14:19 +10:00
parent 286c7afa98 3f48b48fd9
commit b8560c878a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.regn_form.inc
View File

@@ -1455,8 +1455,10 @@ function booking_payment_completed_page()
//set the page title //set the page title
$bookingTitle = !empty($event->booking_eventname) ? $event->booking_eventname : 'Event'; $bookingTitle = !empty($event->booking_eventname) ? $event->booking_eventname : 'Event';
drupal_set_title($bookingTitle . ' Registration Completed'); drupal_set_title($bookingTitle . ' Registration Completed');
$input = variable_get('booking_regn_completed_page');
watchdog('booking_debug', "<pre>Paypal landing page token:\n@info</pre>", array('@info' => print_r($input['value'] , true)));
$output = token_replace(variable_get('booking_regn_completed_page'), booking_define_tokens()); $output = token_replace($input['value'], booking_define_tokens());
$return_array[] = array( $return_array[] = array(
'paragraph' => array( 'paragraph' => array(
'#type' => 'markup', '#type' => 'markup',

7
booking.tokens.inc
View File

@@ -193,11 +193,14 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
'#description' => t(''), '#description' => t(''),
'#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text), '#default_value' => variable_get('booking_regn_confirm_married_text', $booking_regn_confirm_married_text),
); );
//$booking_regn_completed_page_default = variable_get('booking_regn_completed_page');
//$booking_regn_completed_page = isset($booking_regn_completed_page_default['value']) ? $booking_regn_completed_page_default['value'] : '';
$form['confirmation']['booking_regn_completed_page'] = array( $form['confirmation']['booking_regn_completed_page'] = array(
'#title' => t('Text to use for landing page on return from paypal website'), '#title' => t('Text to use for landing page on return from paypal website'),
'#type' => 'textarea', '#type' => 'textarea',
'#description' => t(''), '#description' => t(''),
'#default_value' => variable_get('booking_regn_completed_page', '<p>Thankyou for registering for [booking:eventname].</p>'), //'#default_value' => $booking_regn_completed_page,
'#default_value' => isset(variable_get('booking_regn_completed_page')['value']) ? variable_get('booking_regn_completed_page')['value'] : $defaults,
'#type' => 'text_format', '#type' => 'text_format',
'#format' => 'full_html', '#format' => 'full_html',
); );
@@ -754,4 +757,4 @@ function booking_define_personspecific_tokens($node)
} }
return $tokens; return $tokens;
} }