CRM-18508: Display State/Province in event address in registration emails (handled...

[civicrm-core.git] / xml / templates / message_templates / participant_confirm_html.tpl

diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl
index 87a921cbdc8fe23fee81933a713551dcc4b7a3cf..ca6816d166f356b170afde10b4101951e6500e64 100644 (file)
--- a/xml/templates/message_templates/participant_confirm_html.tpl
+++ b/xml/templates/message_templates/participant_confirm_html.tpl
@@ -37,6 +37,12 @@
     </td>
    </tr>
   {/if}
+  {if $event.allow_selfcancelxfer }
+  This event allows for self-cancel or transfer
+  {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participantID`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
+       <a href="{$selfService}">{ts}Self service cancel transfer{/ts}</a>
+  {/if}
+
   <tr>
    <td>
     <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
@@ -83,24 +89,7 @@
      {if $isShowLocation}
       <tr>
        <td colspan="2" {$valueStyle}>
-        {if $event.location.address.1.name}
-         {$event.location.address.1.name}<br />
-        {/if}
-        {if $event.location.address.1.street_address}
-         {$event.location.address.1.street_address}<br />
-        {/if}
-        {if $event.location.address.1.supplemental_address_1}
-         {$event.location.address.1.supplemental_address_1}<br />
-        {/if}
-        {if $event.location.address.1.supplemental_address_2}
-         {$event.location.address.1.supplemental_address_2}<br />
-        {/if}
-        {if $event.location.address.1.city}
-         {$event.location.address.1.city} {$event.location.address.1.postal_code}
-         {if $event.location.address.1.postal_code_suffix}
-          - {$event.location.address.1.postal_code_suffix}
-         {/if}
-        {/if}
+        {$event.location.address.1.display|nl2br}
        </td>
       </tr>
      {/if}
@@ -137,7 +126,7 @@
       {/foreach}
      {/if}
 
-     {if $event.is_public} 
+     {if $event.is_public}
       <tr>
        <td colspan="2" {$valueStyle}>
         {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture}
@@ -173,9 +162,17 @@
     </table>
    </td>
   </tr>
-
+  {if $event.allow_selfcancelxfer }
+   <tr>
+     <td colspan="2" {$valueStyle}>
+       {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
+         {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
+       <a href="{$selfService}">{ts}Click here to transfer or cancel your registration.{/ts}</a>
+     </td>
+   </tr>
+  {/if}
   <tr>
-   <td>
+   <td colspan="2" {$valueStyle}>
     <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>
    </td>
   </tr>