From: Dave Greenberg Date: Tue, 1 Sep 2015 00:58:23 +0000 (-0700) Subject: CRM-17031 - improve offline event receipts for new installs X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e26a129a7f98c7d9b031462db242cc5433e3911;p=civicrm-core.git CRM-17031 - improve offline event receipts for new installs ---------------------------------------- * CRM-17031: Improvement to offline Event Confirmation template https://issues.civicrm.org/jira/browse/CRM-17031 --- diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 84738868a1..0fea47f064 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -21,6 +21,7 @@ +

{contact.email_greeting}

{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}

{$event.confirm_email_text|htmlize}

diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index d1a5a52d74..1a7daeb2d8 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -1,3 +1,4 @@ +{contact.email_greeting} {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} {$event.confirm_email_text} {/if} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index 4de01793ed..f23c8c144c 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -25,7 +25,7 @@ -

Dear {contact.display_name},

+

Dear {contact.email_greeting},

{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}

{$event.confirm_email_text|htmlize}

diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index e6b33f79b9..21b1001fb0 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -1,4 +1,4 @@ -Dear {contact.display_name}, +Dear {contact.email_greeting}, {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} {$event.confirm_email_text}