From: Eileen McNaughton Date: Mon, 22 May 2023 03:34:02 +0000 (+1200) Subject: Fix event_offline template phones & emails X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f121aa67981ce9b54da3f6f1afda230e01a6f07b;p=civicrm-core.git Fix event_offline template phones & emails --- diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 5237c950fa..4be7ffd9b8 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -76,40 +76,65 @@ {/if} - {if !empty($location.phone.1.phone) || !empty($location.email.1.email)} + {if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}} {ts}Event Contacts:{/ts} - {foreach from=$location.phone item=phone} - {if $phone.phone} + + {if {event.loc_block_id.phone_id.phone|boolean}} - {if $phone.phone_type} - {$phone.phone_type_display} + {if {event.loc_block_id.phone_id.phone_type_id|boolean}} + {event.loc_block_id.phone_id.phone_type_id:label} {else} {ts}Phone{/ts} {/if} - {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} + {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}} {ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if} {/if} - {/foreach} - {foreach from=$location.email item=eventEmail} - {if $eventEmail.email} + {if {event.loc_block_id.phone_2_id.phone|boolean}} + + + {if {event.loc_block_id.phone_2_id.phone_type_id|boolean}} + {event.loc_block_id.phone_2_id.phone_type_id:label} + {else} + {ts}Phone{/ts} + {/if} + + + {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}} {ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if} + + + {/if} + + + {if {event.loc_block_id.email_id.email|boolean}} {ts}Email{/ts} - {$eventEmail.email} + {event.loc_block_id.email_id.email} {/if} - {/foreach} + + {if {event.loc_block_id.email_2_id.email|boolean}} + + + {ts}Email{/ts} + + + {event.loc_block_id.email_2_id.email} + + + {/if} + {/if} {if !empty($event.is_public)} diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index 95c1f1d539..9dbe1d41ab 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -52,20 +52,25 @@ {$location.address.1.display|strip_tags:false} {/if}{*End of isShowLocation condition*} -{if !empty($location.phone.1.phone) || !empty($location.email.1.email)} - +{if {event.loc_block_id.phone_id.phone|boolean} || {event.loc_block_id.email_id.email|boolean}} {ts}Event Contacts:{/ts} -{foreach from=$location.phone item=phone} -{if $phone.phone} -{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} -{/foreach} -{foreach from=$location.email item=eventEmail} -{if $eventEmail.email} +{if {event.loc_block_id.phone_id.phone|boolean}} +{if {event.loc_block_id.phone_id.phone_type_id|boolean}}{event.loc_block_id.phone_id.phone_type_id:label}{else}{ts}Phone{/ts}{/if} {event.loc_block_id.phone_id.phone} {if {event.loc_block_id.phone_id.phone_ext|boolean}} {ts}ext.{/ts} {event.loc_block_id.phone_id.phone_ext}{/if} +{/if} -{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{if {event.loc_block_id.phone_2_id.phone|boolean}} +{if {event.loc_block_id.phone_2_id.phone_type_id|boolean}}{event.loc_block_id.phone_2_id.phone_type_id:label}{else}{ts}Phone{/ts}{/if} {event.loc_block_id.phone_2_id.phone} {if {event.loc_block_id.phone_2_id.phone_ext|boolean}} {ts}ext.{/ts} {event.loc_block_id.phone_2_id.phone_ext}{/if} {/if} +{if {event.loc_block_id.email_id.email|boolean}} +{ts}Email {/ts}{event.loc_block_id.email_id.email} +{/if} +{if {event.loc_block_id.email_2_id.email|boolean}} +{ts}Email {/ts}{event.loc_block_id.email_2_id.email}{/if} +{/if} + + {if !empty($event.is_public)} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} {ts}Download iCalendar entry for this event.{/ts} {$icalFeed}