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

bugfix for email preview

Browse Source
This commit is contained in:
Nathan Coad
2018-01-15 23:27:36 +11:00
parent cfa5b01db8
commit 87b53bbc24
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
booking.emails_admin.inc
View File

@@ -652,7 +652,10 @@ function _booking_email_get_preview_callback($form, $form_state) {
case "balance": case "balance":
$text = variable_get('booking_email_paymentoutstanding_text'); $text = variable_get('booking_email_paymentoutstanding_text');
if (variable_get('booking_enable_combined_pricing', 0) == 1) { if (variable_get('booking_enable_combined_pricing', 0) == 1) {
$text .= "\n</pre><h3>If married</h3>\n<pre>" . variable_get('booking_email_paymentoutstanding_married_text'); $text .= "\n</pre><h3>If married</h3>\n<pre>";
$married_text = variable_get('booking_email_paymentoutstanding_married_text');
// perform the checking of HTML value now since we're pre-pending text to it
$text .= isset($married_text['format']) ? $married_text['value'] : $married_text;
} }
break; break;
case "complete": case "complete":

6
booking.tokens.inc
View File

@@ -624,8 +624,8 @@ function booking_define_personspecific_tokens($node)
if (variable_get('booking_enable_html_mail', 0) == 1) { if (variable_get('booking_enable_html_mail', 0) == 1) {
$balance_link = url('balance/' . $tempid, array('absolute' => TRUE)); $balance_link = url('balance/' . $tempid, array('absolute' => TRUE));
$confirm_link = url('confirm/' . $tempid, array('absolute' => TRUE)); $confirm_link = url('confirm/' . $tempid, array('absolute' => TRUE));
$tokens['balance-payment-link'] = "<a href=\"$balance_link\">$balance_link</a"; $tokens['balance-payment-link'] = "<a href=\"$balance_link\">$balance_link</a>";
$tokens['confirm-payment-link'] = "<a href=\"$confirm_link\">$confirm_link</a"; $tokens['confirm-payment-link'] = "<a href=\"$confirm_link\">$confirm_link</a>";
} }
else { else {
$tokens['balance-payment-link'] = url('balance/' . $tempid, array('absolute' => TRUE)); $tokens['balance-payment-link'] = url('balance/' . $tempid, array('absolute' => TRUE));
@@ -656,7 +656,7 @@ function booking_define_personspecific_tokens($node)
// convert the URL into a href if html emails are enabled // convert the URL into a href if html emails are enabled
if (variable_get('booking_enable_html_mail', 0) == 1) { if (variable_get('booking_enable_html_mail', 0) == 1) {
$travel_link = url('travel/' . $tempid, array('absolute' => TRUE)); $travel_link = url('travel/' . $tempid, array('absolute' => TRUE));
$tokens['travel-link'] = "<a href=\"$travel_link\">$travel_link</a"; $tokens['travel-link'] = "<a href=\"$travel_link\">$travel_link</a>";
} }
else { else {
$tokens['travel-link'] = url('travel/' . $tempid, array('absolute' => TRUE)); $tokens['travel-link'] = url('travel/' . $tempid, array('absolute' => TRUE));