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

More descriptive email definition fields

Browse Source
This commit is contained in:
Nathan Coad
2015-03-18 12:24:04 +11:00
parent 7e6b59707d
commit ef4a87b97f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
booking.admin.inc
View File

@@ -541,8 +541,8 @@ function booking_manual_email_submit($form, &$form_state) {
{ {
watchdog('booking', 'Processing a manual registration email to id @info', array ('@info' => $key)); watchdog('booking', 'Processing a manual registration email to id @info', array ('@info' => $key));
_booking_registration_email($key, false, true); _booking_registration_email($key, false, true);
} }
if ($form_state['values']['email-type'] == 'travelrequired') elseif ($form_state['values']['email-type'] == 'travelrequired')
{ {
watchdog('booking', 'Processing a manual travel form request email to id @info', array ('@info' => $key)); watchdog('booking', 'Processing a manual travel form request email to id @info', array ('@info' => $key));
_booking_travelform_request_email($key); _booking_travelform_request_email($key);

10
booking.tokens.inc
View File

@@ -343,14 +343,15 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
'#title' => t('Registration Successful Email'), '#title' => t('Registration Successful Email'),
'#type' => 'textarea', '#type' => 'textarea',
//'#format' => 'full_html', //'#format' => 'full_html',
'#description' => t('Text to use in an email indicating the person has booked in and is not on the waiting list'), '#description' => t('Text to use in an email indicating the person has booked in, paid their deposit and is not on the waiting list'),
'#default_value' => variable_get('booking_email_bookedin_text', $default_email_text), '#default_value' => variable_get('booking_email_bookedin_text', $default_email_text),
); );
$form['emails']['booking_email_regn_complete_text'] = array( $form['emails']['booking_email_regn_complete_text'] = array(
'#title' => t('Payment Complete Email'), '#title' => t('Payment Complete Email'),
'#type' => 'textarea', '#type' => 'textarea',
//'#format' => 'full_html', //'#format' => 'full_html',
'#description' => t('Email text to indicate a person has completed the payment for their booking'), '#description' => t('Email text to indicate a person has booked in, fully paid and is not on the waiting list. ' .
'This will be sent either at initial registration if the full amount is paid, or when the balance is paid.'),
'#default_value' => variable_get('booking_email_regn_complete_text', $booking_email_regn_complete_text), '#default_value' => variable_get('booking_email_regn_complete_text', $booking_email_regn_complete_text),
); );
$form['emails']['booking_email_partialpayment_received_text'] = array( $form['emails']['booking_email_partialpayment_received_text'] = array(
@@ -361,10 +362,11 @@ $booking_registration_intro_text = variable_get('booking_registration_intro_text
'#default_value' => variable_get('booking_email_partialpayment_received_text', ''), '#default_value' => variable_get('booking_email_partialpayment_received_text', ''),
); );
$form['emails']['booking_email_waitinglist_text'] = array( $form['emails']['booking_email_waitinglist_text'] = array(
'#title' => t('Email text to indicate a person has registered but is on the waiting list'), '#title' => t('Registration on Waiting List Email'),
'#description' => t('Email text to indicate a person has registered but is on the waiting list. ' .
'This will be sent instead of the Registration Successful or Registration Complete emails if the person is on the waiting list.'),
'#type' => 'textarea', '#type' => 'textarea',
//'#format' => 'full_html', //'#format' => 'full_html',
'#description' => t(''),
'#default_value' => variable_get('booking_email_waitinglist_text', $booking_email_waitinglist_text), '#default_value' => variable_get('booking_email_waitinglist_text', $booking_email_waitinglist_text),
); );
$form['emails']['booking_email_paymentoutstanding_subject'] = array ( $form['emails']['booking_email_paymentoutstanding_subject'] = array (