X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=xml%2Ftemplates%2Fmessage_templates%2Fevent_registration_receipt_html.tpl;h=810f995dd4a19c39b5f98679f074cde2288ec05b;hb=cb4793ed619e29fa423d4bdda0164eeb4ca23286;hp=56159a7aea563d9e7633a41514758ceccd79c022;hpb=35598dc5bbdd980bc0d93e7348d844f519acd504;p=civicrm-core.git

diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl
index 56159a7aea..810f995dd4 100644
--- a/xml/templates/message_templates/event_registration_receipt_html.tpl
+++ b/xml/templates/message_templates/event_registration_receipt_html.tpl
@@ -9,7 +9,7 @@
     {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
     {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
 
-    <p>Dear {contact.display_name},</p>
+    {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
     {if $is_pay_later}
       <p>
         This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.
@@ -24,10 +24,9 @@
       <p>{$pay_later_receipt}</p>
     {/if}
 
-    <p>Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}
+    <p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}
   Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}:</p>
 
-
 {if $billing_name}
   <table class="billing-info">
       <tr>
@@ -93,21 +92,7 @@
     <td style="width: 220px">
       {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})<br />
       {if $line_item.event->is_show_location}
-        {if $line_item.location.address.1.name}
-    {$line_item.location.address.1.name}<br />
-        {/if}
-        {if $line_item.location.address.1.street_address}
-    {$line_item.location.address.1.street_address}<br />
-        {/if}
-        {if $line_item.location.address.1.supplemental_address_1}
-    {$line_item.location.address.1.supplemental_address_1}<br />
-        {/if}
-        {if $line_item.location.address.1.supplemental_address_2}
-    {$line_item.location.address.1.supplemental_address_2}<br />
-        {/if}
-        {if $line_item.location.address.1.city}
-    {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$location.address.1.postal_code}
-        {/if}
+        {$line_item.location.address.1.display|nl2br}
       {/if}{*End of isShowLocation condition*}<br /><br />
       {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
     </td>