From 4de4dbe9940cdce0de92c9fa48339db7e32456b8 Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Thu, 13 Mar 2014 11:49:51 +0000 Subject: [PATCH] CRM-14340 - Fixes for iCals in event emails CRM-14340 - Fixes for empty / unnecessary iCal feeds in event emails --- .../event_offline_receipt_html.tpl | 2 + .../event_offline_receipt_text.tpl | 3 + .../event_online_receipt_html.tpl | 455 ++++++++++++++++++ .../event_online_receipt_text.tpl | 282 +++++++++++ .../participant_cancelled_html.tpl | 146 ++++++ .../participant_cancelled_text.tpl | 59 +++ .../participant_confirm_html.tpl | 187 +++++++ .../participant_confirm_text.tpl | 89 ++++ .../participant_expired_html.tpl | 149 ++++++ .../participant_expired_text.tpl | 63 +++ .../event_offline_receipt_html.tpl | 2 + .../event_offline_receipt_text.tpl | 3 + .../event_online_receipt_html.tpl | 2 + .../event_online_receipt_text.tpl | 2 + .../participant_cancelled_html.tpl | 7 - .../participant_cancelled_text.tpl | 2 - .../participant_confirm_html.tpl | 4 +- .../participant_confirm_text.tpl | 5 +- .../participant_expired_html.tpl | 7 - .../participant_expired_text.tpl | 2 - 20 files changed, 1451 insertions(+), 20 deletions(-) create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_html.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl create mode 100644 CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl index 5dc686c2f4..149dfeb1ac 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_offline_receipt_html.tpl @@ -130,12 +130,14 @@ registration process.{/ts}

Dear {contact.display_name},

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

{$event.confirm_email_text|htmlize}

+ + {else} +

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.

+ + {/if} + +

+ {if $isOnWaitlist} +

{ts}You have been added to the WAIT LIST for this event.{/ts}

+ {if $isPrimary} +

{ts}If space becomes available you will receive an email with +a link to a web page where you can complete your registration.{/ts}

+ {/if} + {elseif $isRequireApproval} +

{ts}Your registration has been submitted.{/ts}

+ {if $isPrimary} +

{ts}Once your registration has been reviewed, you will receive +an email with a link to a web page where you can complete the +registration process.{/ts}

+ {/if} + {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} +

{$pay_later_receipt}

{* FIXME: this might be text rather than HTML *} + {else} +

{ts}Please print this confirmation for your records.{/ts}

+ {/if} + +

+ + + + + + + + + + {if $conference_sessions} + + + + + + + {/if} + + {if $event.participant_role neq 'Attendee' and $defaultRole} + + + + + {/if} + + {if $isShowLocation} + + + + {/if} + + {if $location.phone.1.phone || $location.email.1.email} + + + + {foreach from=$location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + {if $event.is_public} + + + + {/if} + {if $event.is_share} + + + + {/if} + {if $payer.name} + + + + + + + {/if} + {if $event.is_monetary} + + + + + + {if $lineItem} + {foreach from=$lineItem item=value key=priceset} + {if $value neq 'skip'} + {if $isPrimary} + {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} + + + + {/if} + {/if} + + + + {/if} + {/foreach} + {/if} + + {if $amounts && !$lineItem} + {foreach from=$amounts item=amnt key=level} + + + + {/foreach} + {/if} + + {if $isPrimary} + + + + + {if $pricesetFieldsCount } + + + + {/if} + + {if $register_date} + + + + + {/if} + + {if $receive_date} + + + + + {/if} + + {if $contributionTypeName} + + + + + {/if} + + {if $trxn_id} + + + + + {/if} + + {if $paidBy} + + + + + {/if} + + {if $checkNumber} + + + + + {/if} + + {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} + + + + + + + {/if} + + {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} + + + + + + + {/if} + + {/if} + + {/if} {* End of conditional section for Paid events *} + + +{if $customPre} +{foreach from=$customPre item=customPr key=i} + + {foreach from=$customPr item=customValue key=customName} + {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + + + + + {/if} + {/foreach} +{/foreach} +{/if} + +{if $customPost} +{foreach from=$customPost item=customPos key=j} + + {foreach from=$customPos item=customValue key=customName} + {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + + + + +{/if} +{/foreach} +{/foreach} +{/if} + +{if $customProfile} +{foreach from=$customProfile.profile item=eachParticipant key=participantID} + + {foreach from=$eachParticipant item=eachProfile key=pid} + + {foreach from=$eachProfile item=val key=field} + {foreach from=$val item=v key=f} + + + {/foreach} + + {/foreach} +{/foreach} +{/foreach} +{/if} + + {if $customGroup} + {foreach from=$customGroup item=value key=customName} + + + + {foreach from=$value item=v key=n} + + + + + {/foreach} + {/foreach} + {/if} + +

+ {ts}Event Information and Location{/ts} +

+ {$event.event_title}
+ {$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if} +

+ {ts}Your schedule:{/ts} +

+ {assign var='group_by_day' value='NA'} + {foreach from=$conference_sessions item=session} + {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} + {assign var='group_by_day' value=$session.start_date} + {$group_by_day|date_format:"%m/%d/%Y"}
+ {/if} + {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
+ {if $session.location} {$session.location}
{/if} + {/foreach} +

+ {ts}Participant Role{/ts} +

+ {$event.participant_role} +

+ {if $location.address.1.name} + {$location.address.1.name}
+ {/if} + {if $location.address.1.street_address} + {$location.address.1.street_address}
+ {/if} + {if $location.address.1.supplemental_address_1} + {$location.address.1.supplemental_address_1}
+ {/if} + {if $location.address.1.supplemental_address_2} + {$location.address.1.supplemental_address_2}
+ {/if} + {if $location.address.1.city} + {$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
+ {/if} +

+ {ts}Event Contacts:{/ts} +

+ {if $phone.phone_type} + {$phone.phone_type_display} + {else} + {ts}Phone{/ts} + {/if} +

+ {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} +

+ {ts}Email{/ts} +

+ {$eventEmail.email} +

+ {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} +

+ {capture assign=eventUrl}{crmURL p='civicrm/event/info' q="id=`$event.id`&reset=1" a=true fe=1 h=1}{/capture} + {include file="CRM/common/SocialNetwork.tpl" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl} +

+ {ts}You were registered by:{/ts} +

+ {$payer.name} +

+ {$event.fee_label} +

+ {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} +

+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + + {if $pricesetFieldsCount }{/if} + + {foreach from=$value item=line} + + + + + + {if $pricesetFieldsCount } {/if} + + {/foreach} +

{ts}Item{/ts}	{ts}Qty{/ts}	{ts}Each{/ts}	{ts}Total{/ts}	{ts}Total Participants{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description\|truncate:30:"..."} {/if} +	+ {$line.qty} +	+ {$line.unit_price\|crmMoney:$currency} +	+ {$line.line_total\|crmMoney:$currency} +	{$line.participant_count}

+ {$amnt.amount|crmMoney:$currency} {$amnt.label} +

+ {ts}Total Amount{/ts} +

+ {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} +

+ {ts}Total Participants{/ts}

+ {assign var="count" value= 0} + {foreach from=$lineItem item=pcount} + {assign var="lineItemCount" value=0} + {if $pcount neq 'skip'} + {foreach from=$pcount item=p_count} + {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} + {/foreach} + {if $lineItemCount < 1 } + {assign var="lineItemCount" value=1} + {/if} + {assign var="count" value=$count+$lineItemCount} + {/if} + {/foreach} + {$count} +

+ {ts}Registration Date{/ts} +

+ {$register_date|crmDate} +

+ {ts}Transaction Date{/ts} +

+ {$receive_date|crmDate} +

+ {ts}Financial Type{/ts} +

+ {$contributionTypeName} +

+ {ts}Transaction #{/ts} +

+ {$trxn_id} +

+ {ts}Paid By{/ts} +

+ {$paidBy} +

+ {ts}Check Number{/ts} +

+ {$checkNumber} +

+ {ts}Billing Name and Address{/ts} +

+ {$billingName}
+ {$address|nl2br} +

+ {ts}Credit Card Information{/ts} +

+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +

{$customPre_grouptitle.$i}

{$customName}

{$customValue}

{$customPost_grouptitle.$j}

{$customName}

{$customValue}

{ts 1=$participantID+2}Participant %1{/ts}

{$customProfile.title.$pid}

{$field}

{$v}

+ {$customName} +

+ {$n} +

+ {$v} +

+ + + + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl new file mode 100644 index 0000000000..10847d8fe8 --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/event_online_receipt_text.tpl @@ -0,0 +1,282 @@ +Dear {contact.display_name}, + +{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)} +{$event.confirm_email_text} + +{else} +Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}. + +{/if} + +{if $isOnWaitlist} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts}You have been added to the WAIT LIST for this event.{/ts} + +{if $isPrimary} +{ts}If space becomes available you will receive an email with +a link to a web page where you can complete your registration.{/ts} +{/if} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{elseif $isRequireApproval} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts}Your registration has been submitted.{/ts} + +{if $isPrimary} +{ts}Once your registration has been reviewed, you will receive +an email with a link to a web page where you can complete the +registration process.{/ts} + +{/if} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$pay_later_receipt} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{else} + +{ts}Please print this confirmation for your records.{/ts} +{/if} + + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts}Event Information and Location{/ts} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$event.event_title} +{$event.event_start_date|date_format:"%A"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:"%A"} {$event.event_end_date|crmDate}{/if}{/if} +{if $conference_sessions} + + +{ts}Your schedule:{/ts} +{assign var='group_by_day' value='NA'} +{foreach from=$conference_sessions item=session} +{if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} +{assign var='group_by_day' value=$session.start_date} + +{$group_by_day|date_format:"%m/%d/%Y"} + + +{/if} +{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title} +{if $session.location} {$session.location}{/if} +{/foreach} +{/if} + +{if $event.participant_role neq 'Attendee' and $defaultRole} +{ts}Participant Role{/ts}: {$event.participant_role} +{/if} + +{if $isShowLocation} +{if $location.address.1.name} + +{$location.address.1.name} +{/if} +{if $location.address.1.street_address}{$location.address.1.street_address} +{/if} +{if $location.address.1.supplemental_address_1}{$location.address.1.supplemental_address_1} +{/if} +{if $location.address.1.supplemental_address_2}{$location.address.1.supplemental_address_2} +{/if} +{if $location.address.1.city}{$location.address.1.city}, {$location.address.1.state_province} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if} +{/if} + +{/if}{*End of isShowLocation condition*} + +{if $location.phone.1.phone || $location.email.1.email} + +{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} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $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 File:{/ts} {$icalFeed} +{/if} + +{if $payer.name} +You were registered by: {$payer.name} +{/if} +{if $event.is_monetary} {* This section for Paid events only.*} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$event.fee_label} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{if $lineItem}{foreach from=$lineItem item=value key=priceset} + +{if $value neq 'skip'} +{if $isPrimary} +{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *} +{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info} + +{/if} +{/if} +-----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} + +{capture assign=ts_item}{ts}Item{/ts}{/capture} +{capture assign=ts_qty}{ts}Qty{/ts}{/capture} +{capture assign=ts_each}{ts}Each{/ts}{/capture} +{capture assign=ts_total}{ts}Total{/ts}{/capture} +{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} +{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {$ts_total|string_format:"%10s"} {$ts_participant_total|string_format:"%10s"} +-----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} + +{foreach from=$value item=line} +{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} +{capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {$line.line_total|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"} +{/foreach} +{/if} +{/foreach} +{/if} +{if $amounts && !$lineItem} +{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label} +{/foreach} +{/if} +{if $isPrimary } + +{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} + +{if $pricesetFieldsCount } + {assign var="count" value= 0} + {foreach from=$lineItem item=pcount} + {assign var="lineItemCount" value=0} + {if $pcount neq 'skip'} + {foreach from=$pcount item=p_count} + {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} + {/foreach} + {if $lineItemCount < 1 } + {assign var="lineItemCount" value=1} + {/if} + {assign var="count" value=$count+$lineItemCount} + {/if} + {/foreach} + +{ts}Total Participants{/ts}: {$count} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$register_date|crmDate} +{/if} +{if $receive_date} +{ts}Transaction Date{/ts}: {$receive_date|crmDate} +{/if} +{if $contributionTypeName} +{ts}Financial Type{/ts}: {$contributionTypeName} +{/if} +{if $trxn_id} +{ts}Transaction #{/ts}: {$trxn_id} +{/if} +{if $paidBy} +{ts}Paid By{/ts}: {$paidBy} +{/if} +{if $checkNumber} +{ts}Check Number{/ts}: {$checkNumber} +{/if} +{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts}Billing Name and Address{/ts} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$billingName} +{$address} +{/if} + +{if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts}Credit Card Information{/ts} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$credit_card_type} +{$credit_card_number} +{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate} +{/if} +{/if} +{/if} {* End of conditional section for Paid events *} + +{if $customPre} +{foreach from=$customPre item=customPr key=i} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$customPre_grouptitle.$i} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{foreach from=$customPr item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/foreach} +{/if} + +{if $customPost} +{foreach from=$customPost item=customPos key=j} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{$customPost_grouptitle.$j} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{foreach from=$customPos item=customValue key=customName} +{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields} + {$customName}: {$customValue} +{/if} +{/foreach} +{/foreach} +{/if} +{if $customProfile} + +{foreach from=$customProfile.profile item=eachParticipant key=participantID} +==========================================================={if $pricesetFieldsCount }===================={/if} + +{ts 1=$participantID+2}Participant Information - Participant %1{/ts} + +==========================================================={if $pricesetFieldsCount }===================={/if} + +{foreach from=$eachParticipant item=eachProfile key=pid} +----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} + +{$customProfile.title.$pid} +----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if} + +{foreach from=$eachProfile item=val key=field} +{foreach from=$val item=v key=f} +{$field}: {$v} +{/foreach} +{/foreach} +{/foreach} +{/foreach} +{/if} +{if $customGroup} +{foreach from=$customGroup item=value key=customName} +=========================================================={if $pricesetFieldsCount }===================={/if} + +{$customName} +=========================================================={if $pricesetFieldsCount }===================={/if} + +{foreach from=$value item=v key=n} +{$n}: {$v} +{/foreach} +{/foreach} +{/if} diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl new file mode 100644 index 0000000000..d7af3a7859 --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_html.tpl @@ -0,0 +1,146 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{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} + + + + + + + + + + + + + + + + + + + + + +

{ts 1=$contact.display_name}Dear %1{/ts},

{ts}Your Event Registration has been cancelled.{/ts}

+ + + + + + + + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +

+ {ts}Event Information and Location{/ts} +
+ {$event.event_title} + {$event.event_start_date\|crmDate}{if $event.event_end_date}-{if $event.event_end_date\|date_format:"%Y%m%d" == $event.event_start_date\|date_format:"%Y%m%d"}{$event.event_end_date\|crmDate:0:1}{else}{$event.event_end_date\|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts}: +	+ {$participant.role} +
+ {if $event.location.address.1.name} + {$event.location.address.1.name} + {/if} + {if $event.location.address.1.street_address} + {$event.location.address.1.street_address} + {/if} + {if $event.location.address.1.supplemental_address_1} + {$event.location.address.1.supplemental_address_1} + {/if} + {if $event.location.address.1.supplemental_address_2} + {$event.location.address.1.supplemental_address_2} + {/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} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} +	+ {$phone.phone} +
+ {ts}Email{/ts} +	+ {$eventEmail.email} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} +	+ {$participant.register_date\|crmDate} +

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+ + + + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl new file mode 100644 index 0000000000..f79abd2c02 --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_cancelled_text.tpl @@ -0,0 +1,59 @@ +{ts 1=$contact.display_name}Dear %1{/ts}, + +{ts}Your Event Registration has been cancelled.{/ts} + + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{if $event.location.address.1.name} + +{$event.location.address.1.name} +{/if} +{if $event.location.address.1.street_address}{$event.location.address.1.street_address} +{/if} +{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1} +{/if} +{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2} +{/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} + +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl new file mode 100644 index 0000000000..97b4f1610a --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_html.tpl @@ -0,0 +1,187 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{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} + + + + + + + + + + + + + + {if !$isAdditional and $participant.id} + + + + + + + {/if} + + + + + + + + +

{ts 1=$contact.display_name}Dear %1{/ts},

+ {ts}Confirm Your Registration{/ts} +

+ {capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture} + Go to a web page where you can confirm your registration online +

+ + + + + + + + {if $conference_sessions} + + + + + + + {/if} + + + + + + {if $isShowLocation} + + + + {/if} + + {if $event.location.phone.1.phone || $event.location.email.1.email} + + + + {foreach from=$event.location.phone item=phone} + {if $phone.phone} + + + + + {/if} + {/foreach} + {foreach from=$event.location.email item=eventEmail} + {if $eventEmail.email} + + + + + {/if} + {/foreach} + {/if} + + {if $event.is_public} + + + + {/if} + + {if $contact.email} + + + + + + + {/if} + + {if $register_date} + + + + + {/if} + +

+ {ts}Event Information and Location{/ts} +
+ {$event.event_title} + {$event.event_start_date\|crmDate}{if $event.event_end_date}-{if $event.event_end_date\|date_format:"%Y%m%d" == $event.event_start_date\|date_format:"%Y%m%d"}{$event.event_end_date\|crmDate:0:1}{else}{$event.event_end_date\|crmDate}{/if}{/if} +
+ {ts}Your schedule:{/ts} +
+ {assign var='group_by_day' value='NA'} + {foreach from=$conference_sessions item=session} + {if $session.start_date\|date_format:"%Y/%m/%d" != $group_by_day\|date_format:"%Y/%m/%d"} + {assign var='group_by_day' value=$session.start_date} + {$group_by_day\|date_format:"%m/%d/%Y"} + {/if} + {$session.start_date\|crmDate:0:1}{if $session.end_date}-{$session.end_date\|crmDate:0:1}{/if} {$session.title} + {if $session.location} {$session.location} {/if} + {/foreach} +
+ {ts}Participant Role{/ts}: +	+ {$participant.role} +
+ {if $event.location.address.1.name} + {$event.location.address.1.name} + {/if} + {if $event.location.address.1.street_address} + {$event.location.address.1.street_address} + {/if} + {if $event.location.address.1.supplemental_address_1} + {$event.location.address.1.supplemental_address_1} + {/if} + {if $event.location.address.1.supplemental_address_2} + {$event.location.address.1.supplemental_address_2} + {/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} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} +	+ {$phone.phone} +
+ {ts}Email{/ts} +	+ {$eventEmail.email} +
+ {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {ts}Download iCalendar File{/ts} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} +	+ {$participant.register_date\|crmDate} +

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+ + + + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl new file mode 100644 index 0000000000..6fc6205f9a --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_confirm_text.tpl @@ -0,0 +1,89 @@ +{ts 1=$contact.display_name}Dear %1{/ts}, +{if !$isAdditional and $participant.id} + +=========================================================== +{ts}Confirm Your Registration{/ts} + +=========================================================== +{capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture} +Click this link to go to a web page where you can confirm your registration online: +{$confirmUrl} +{/if} + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +{if $conference_sessions} + + +{ts}Your schedule:{/ts} +{assign var='group_by_day' value='NA'} +{foreach from=$conference_sessions item=session} +{if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} +{assign var='group_by_day' value=$session.start_date} + +{$group_by_day|date_format:"%m/%d/%Y"} + + +{/if} +{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title} +{if $session.location} {$session.location}{/if} +{/foreach} +{/if} + + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{if $event.location.address.1.name} + +{$event.location.address.1.name} +{/if} +{if $event.location.address.1.street_address}{$event.location.address.1.street_address} +{/if} +{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1} +{/if} +{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2} +{/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} + +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $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 File:{/ts} {$icalFeed} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl new file mode 100644 index 0000000000..ca2621f9e5 --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_html.tpl @@ -0,0 +1,149 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{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} + + + + + + + + + + + + + + + + + + + + + +

{ts 1=$contact.display_name}Dear %1{/ts},

{ts 1=$event.event_title}Your pending event registration for %1 has expired +because you did not confirm your registration.{/ts}

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions +or want to inquire about reinstating your registration for this event.{/ts}

+ {ts}Event Information and Location{/ts} +
+ {$event.event_title} + {$event.event_start_date\|crmDate}{if $event.event_end_date}-{if $event.event_end_date\|date_format:"%Y%m%d" == $event.event_start_date\|date_format:"%Y%m%d"}{$event.event_end_date\|crmDate:0:1}{else}{$event.event_end_date\|crmDate}{/if}{/if} +
+ {ts}Participant Role{/ts}: +	+ {$participant.role} +
+ {if $event.location.address.1.name} + {$event.location.address.1.name} + {/if} + {if $event.location.address.1.street_address} + {$event.location.address.1.street_address} + {/if} + {if $event.location.address.1.supplemental_address_1} + {$event.location.address.1.supplemental_address_1} + {/if} + {if $event.location.address.1.supplemental_address_2} + {$event.location.address.1.supplemental_address_2} + {/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} +
+ {ts}Event Contacts:{/ts} +
+ {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if} +	+ {$phone.phone} +
+ {ts}Email{/ts} +	+ {$eventEmail.email} +
+ {ts}Registered Email{/ts} +
+ {$contact.email} +
+ {ts}Registration Date{/ts} +	+ {$participant.register_date\|crmDate} +

{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}

+ + + + diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl new file mode 100644 index 0000000000..534c1c6578 --- /dev/null +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/participant_expired_text.tpl @@ -0,0 +1,63 @@ +{ts 1=$contact.display_name}Dear %1{/ts}, + +{ts 1=$event.event_title}Your pending event registration for %1 has expired +because you did not confirm your registration.{/ts} + + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions +or want to inquire about reinstating your registration for this event.{/ts} + +=========================================================== +{ts}Event Information and Location{/ts} + +=========================================================== +{$event.event_title} +{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} + +{ts}Participant Role{/ts}: {$participant.role} + +{if $isShowLocation} +{if $event.location.address.1.name} + +{$event.location.address.1.name} +{/if} +{if $event.location.address.1.street_address}{$event.location.address.1.street_address} +{/if} +{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1} +{/if} +{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2} +{/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} + +{/if}{*End of isShowLocation condition*} + +{if $event.location.phone.1.phone || $event.location.email.1.email} + +{ts}Event Contacts:{/ts} +{foreach from=$event.location.phone item=phone} +{if $phone.phone} + +{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} +{/foreach} +{foreach from=$event.location.email item=eventEmail} +{if $eventEmail.email} + +{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} +{/if} + +{if $contact.email} + +=========================================================== +{ts}Registered Email{/ts} + +=========================================================== +{$contact.email} +{/if} + +{if $register_date} +{ts}Registration Date{/ts}: {$participant.register_date|crmDate} +{/if} + +{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts} + diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 5dc686c2f4..149dfeb1ac 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -130,12 +130,14 @@ registration process.{/ts}

{/if} {/foreach} {/if} + {if $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 File{/ts} + {/if} {if $event.is_share} diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index 726b3f3e7a..10847d8fe8 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -105,8 +105,10 @@ registration process.{/ts} {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} +{if $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 File:{/ts} {$icalFeed} +{/if} {if $payer.name} You were registered by: {$payer.name} diff --git a/xml/templates/message_templates/participant_cancelled_html.tpl b/xml/templates/message_templates/participant_cancelled_html.tpl index 953f679077..d7af3a7859 100644 --- a/xml/templates/message_templates/participant_cancelled_html.tpl +++ b/xml/templates/message_templates/participant_cancelled_html.tpl @@ -105,13 +105,6 @@ {/foreach} {/if} - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - - - {ts}Download iCalendar File{/ts} - - - {if $contact.email} diff --git a/xml/templates/message_templates/participant_cancelled_text.tpl b/xml/templates/message_templates/participant_cancelled_text.tpl index ae0543eeac..f79abd2c02 100644 --- a/xml/templates/message_templates/participant_cancelled_text.tpl +++ b/xml/templates/message_templates/participant_cancelled_text.tpl @@ -42,8 +42,6 @@ {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} -{capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} -{ts}Download iCalendar File{/ts}: {$icalFeed} {if $contact.email} =========================================================== diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index 10aba0e2cd..97b4f1610a 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -137,12 +137,14 @@ {/foreach} {/if} - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} + {if $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 File{/ts} + {/if} {if $contact.email} diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl index 2a3783a49a..6fc6205f9a 100644 --- a/xml/templates/message_templates/participant_confirm_text.tpl +++ b/xml/templates/message_templates/participant_confirm_text.tpl @@ -67,8 +67,11 @@ Click this link to go to a web page where you can confirm your registration onli {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} +{if $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 File{/ts}: {$icalFeed} +{ts}Download iCalendar File:{/ts} {$icalFeed} +{/if} + {if $contact.email} =========================================================== diff --git a/xml/templates/message_templates/participant_expired_html.tpl b/xml/templates/message_templates/participant_expired_html.tpl index d203e196f5..ca2621f9e5 100644 --- a/xml/templates/message_templates/participant_expired_html.tpl +++ b/xml/templates/message_templates/participant_expired_html.tpl @@ -108,13 +108,6 @@ or want to inquire about reinstating your registration for this event.{/ts}

{/foreach} {/if} - {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} - - - {ts}Download iCalendar File{/ts} - - - {if $contact.email} diff --git a/xml/templates/message_templates/participant_expired_text.tpl b/xml/templates/message_templates/participant_expired_text.tpl index fcf0630955..534c1c6578 100644 --- a/xml/templates/message_templates/participant_expired_text.tpl +++ b/xml/templates/message_templates/participant_expired_text.tpl @@ -46,8 +46,6 @@ or want to inquire about reinstating your registration for this event.{/ts} {ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach} {/if} -{capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} -{ts}Download iCalendar File{/ts}: {$icalFeed} {if $contact.email} =========================================================== -- 2.25.1