CRM-18508: Display State/Province in event address in registration emails (handled...
authoryashodha <yashodha.chaku@webaccessglobal.com>
Thu, 11 Aug 2016 09:27:22 +0000 (14:57 +0530)
committeryashodha <yashodha.chaku@webaccessglobal.com>
Thu, 11 Aug 2016 09:27:22 +0000 (14:57 +0530)
----------------------------------------
* CRM-18508: State/Province not shown in Event Confirmation Emails
  https://issues.civicrm.org/jira/browse/CRM-18508

30 files changed:
CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl [new file with mode: 0644]
CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl [new file with mode: 0644]
CRM/Upgrade/Incremental/sql/4.7.11.mysql.tpl
xml/templates/message_templates/event_registration_receipt_html.tpl
xml/templates/message_templates/event_registration_receipt_text.tpl
xml/templates/message_templates/participant_cancelled_html.tpl
xml/templates/message_templates/participant_cancelled_text.tpl
xml/templates/message_templates/participant_confirm_html.tpl
xml/templates/message_templates/participant_confirm_text.tpl
xml/templates/message_templates/participant_expired_html.tpl
xml/templates/message_templates/participant_expired_text.tpl
xml/templates/message_templates/participant_transferred_html.tpl
xml/templates/message_templates/participant_transferred_text.tpl
xml/templates/message_templates/payment_or_refund_notification_html.tpl
xml/templates/message_templates/payment_or_refund_notification_text.tpl

diff --git a/CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl b/CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl
new file mode 100644 (file)
index 0000000..3db5386
--- /dev/null
@@ -0,0 +1,16 @@
+{php}
+  $dir = SMARTY_DIR . '/../../CRM/Upgrade/4.7.11.msg_template/message_templates';
+  $templates = array();
+  foreach (preg_grep('/\.tpl$/', scandir($dir)) as $filename) {
+    $parts = explode('_', basename($filename, '.tpl'));
+    $templates[] = array('type' => array_pop($parts), 'name' => implode('_', $parts), 'filename' => "$dir/$filename");
+  }
+  $this->assign('templates', $templates);
+{/php}
+
+{foreach from=$templates item=tpl}
+  {fetch assign=content file=$tpl.filename}
+  SELECT @workflow_id := MAX(id) FROM civicrm_option_value WHERE name = '{$tpl.name}';
+  SELECT @content := msg_{$tpl.type} FROM civicrm_msg_template WHERE workflow_id = @workflow_id AND is_reserved = 1 LIMIT 1;
+  UPDATE civicrm_msg_template SET msg_{$tpl.type} = '{$content|escape:"quotes"}' WHERE workflow_id = @workflow_id AND (is_reserved = 1 OR (is_default = 1 AND msg_{$tpl.type} = @content));
+{/foreach}
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_html.tpl
new file mode 100644 (file)
index 0000000..58ff6f1
--- /dev/null
@@ -0,0 +1,513 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+    <p>{contact.email_greeting}</p>
+
+    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+     <p>{$event.confirm_email_text|htmlize}</p>
+    {/if}
+
+    {if $isOnWaitlist}
+     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>
+     {if $isPrimary}
+       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>
+     {/if}
+    {elseif $isRequireApproval}
+     <p>{ts}Your registration has been submitted.{/ts}</p>
+     {if $isPrimary}
+      <p>{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}</p>
+     {/if}
+    {elseif $is_pay_later}
+     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}
+    {else}
+     <p>{ts}Please print this confirmation for your records.{/ts}</p>
+    {/if}
+
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+
+     {if $event.participant_role neq 'Attendee' and $defaultRole}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Participant Role{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$event.participant_role}
+       </td>
+      </tr>
+     {/if}
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $location.phone.1.phone || $location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}
+           {$phone.phone_type_display}
+          {else}
+           {ts}Phone{/ts}
+          {/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {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}
+        <a href="{$icalFeed}">{ts}Download iCalendar File{/ts}</a>
+       </td>
+      </tr>
+     {/if}
+
+     {if $email}
+      <tr>
+       <th {$headerStyle}>
+        {ts}Registered Email{/ts}
+       </th>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$email}
+       </td>
+      </tr>
+     {/if}
+
+
+     {if $event.is_monetary}
+
+      <tr>
+       <th {$headerStyle}>
+        {$event.fee_label}
+       </th>
+      </tr>
+
+      {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. *}
+           <tr>
+            <td colspan="2" {$labelStyle}>
+             {ts 1=$priceset+1}Participant %1{/ts}
+            </td>
+           </tr>
+          {/if}
+         {/if}
+         <tr>
+          <td colspan="2" {$valueStyle}>
+           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
+            <tr>
+             <th>{ts}Item{/ts}</th>
+             <th>{ts}Qty{/ts}</th>
+             <th>{ts}Each{/ts}</th>
+             {if $dataArray}
+              <th>{ts}SubTotal{/ts}</th>
+              <th>{ts}Tax Rate{/ts}</th>
+              <th>{ts}Tax Amount{/ts}</th>
+             {/if}
+             <th>{ts}Total{/ts}</th>
+       {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+            </tr>
+            {foreach from=$value item=line}
+             <tr>
+              <td>
+        {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+              </td>
+              <td>
+               {$line.qty}
+              </td>
+              <td>
+               {$line.unit_price|crmMoney}
+              </td>
+              {if $dataArray}
+               <td>
+                {$line.unit_price*$line.qty|crmMoney}
+               </td>
+               {if $line.tax_rate != "" || $line.tax_amount != ""}
+                <td>
+                 {$line.tax_rate|string_format:"%.2f"}%
+                </td>
+                <td>
+                 {$line.tax_amount|crmMoney}
+                </td>
+               {else}
+                <td></td>
+                <td></td>
+               {/if}
+              {/if}
+              <td>
+               {$line.line_total+$line.tax_amount|crmMoney}
+              </td>
+        {if  $pricesetFieldsCount }
+        <td>
+    {$line.participant_count}
+              </td>
+        {/if}
+             </tr>
+            {/foreach}
+           </table>
+          </td>
+         </tr>
+        {/if}
+       {/foreach}
+       {if $dataArray}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Amount Before Tax:{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$totalAmount-$totalTaxAmount|crmMoney}
+         </td>
+        </tr>
+        {foreach from=$dataArray item=value key=priceset}
+          <tr>
+           {if $priceset || $priceset == 0}
+            <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
+            <td>&nbsp;{$value|crmMoney:$currency}</td>
+           {else}
+            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
+            <td>&nbsp;{$value|crmMoney:$currency}</td>
+           {/if}
+          </tr>
+        {/foreach}
+       {/if}
+      {/if}
+
+      {if $amount && !$lineItem}
+       {foreach from=$amount item=amnt key=level}
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$amnt.amount|crmMoney} {$amnt.label}
+         </td>
+        </tr>
+       {/foreach}
+      {/if}
+      {if $totalTaxAmount}
+       <tr>
+        <td {$labelStyle}>
+         {ts}Total Tax Amount{/ts}
+        </td>
+        <td {$valueStyle}>
+         {$totalTaxAmount|crmMoney:$currency}
+        </td>
+       </tr>
+      {/if}
+      {if $isPrimary}
+       <tr>
+        <td {$labelStyle}>
+        {if $balanceAmount}
+           {ts}Total Paid{/ts}
+        {else}
+           {ts}Total Amount{/ts}
+         {/if}
+        </td>
+        <td {$valueStyle}>
+         {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}
+        </td>
+       </tr>
+      {if $balanceAmount}
+       <tr>
+        <td {$labelStyle}>
+         {ts}Balance{/ts}
+        </td>
+        <td {$valueStyle}>
+         {$balanceAmount|crmMoney}
+        </td>
+       </tr>
+      {/if}
+       {if $pricesetFieldsCount }
+     <tr>
+       <td {$labelStyle}>
+   {ts}Total Participants{/ts}</td>
+       <td {$valueStyle}>
+   {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}
+       </td>
+     </tr>
+     {/if}
+       {if $is_pay_later}
+        <tr>
+         <td colspan="2" {$labelStyle}>
+          {$pay_later_receipt}
+         </td>
+        </tr>
+       {/if}
+
+       {if $register_date}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Registration Date{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$register_date|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+       {if $receive_date}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Transaction Date{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$receive_date|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+       {if $financialTypeName}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Financial Type{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$financialTypeName}
+         </td>
+        </tr>
+       {/if}
+
+       {if $trxn_id}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Transaction #{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$trxn_id}
+         </td>
+        </tr>
+       {/if}
+
+       {if $paidBy}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Paid By{/ts}
+         </td>
+         <td {$valueStyle}>
+         {$paidBy}
+         </td>
+        </tr>
+       {/if}
+
+       {if $checkNumber}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Check Number{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$checkNumber}
+         </td>
+        </tr>
+       {/if}
+
+       {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+        <tr>
+         <th {$headerStyle}>
+          {ts}Billing Name and Address{/ts}
+         </th>
+        </tr>
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$billingName}<br />
+          {$address|nl2br}
+         </td>
+        </tr>
+       {/if}
+
+       {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+        <tr>
+         <th {$headerStyle}>
+          {ts}Credit Card Information{/ts}
+         </th>
+        </tr>
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$credit_card_type}<br />
+          {$credit_card_number}<br />
+          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+      {/if}
+
+     {/if} {* End of conditional section for Paid events *}
+
+     {if $customPre}
+      <tr>
+       <th {$headerStyle}>
+        {$customPre_grouptitle}
+       </th>
+      </tr>
+      {foreach from=$customPre item=value key=customName}
+       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+        <tr>
+         <td {$labelStyle}>
+          {$customName}
+         </td>
+         <td {$valueStyle}>
+          {$value}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {if $customPost}
+      <tr>
+       <th {$headerStyle}>
+        {$customPost_grouptitle}
+       </th>
+      </tr>
+      {foreach from=$customPost item=value key=customName}
+       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+        <tr>
+         <td {$labelStyle}>
+          {$customName}
+         </td>
+         <td {$valueStyle}>
+          {$value}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {if $customProfile}
+      {foreach from=$customProfile item=value key=customName}
+       <tr>
+        <th {$headerStyle}>
+         {ts 1=$customName+1}Participant Information - Participant %1{/ts}
+        </th>
+       </tr>
+       {foreach from=$value item=val key=field}
+        {if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost'}
+         <tr>
+          <td colspan="2" {$labelStyle}>
+           {if $field eq 'additionalCustomPre'}
+            {$additionalCustomPre_grouptitle}
+           {else}
+            {$additionalCustomPost_grouptitle}
+           {/if}
+          </td>
+         </tr>
+         {foreach from=$val item=v key=f}
+          <tr>
+           <td {$labelStyle}>
+            {$f}
+           </td>
+           <td {$valueStyle}>
+            {$v}
+           </td>
+          </tr>
+         {/foreach}
+        {/if}
+       {/foreach}
+      {/foreach}
+     {/if}
+
+     {if $customGroup}
+      {foreach from=$customGroup item=value key=customName}
+       <tr>
+        <th {$headerStyle}>
+         {$customName}
+        </th>
+       </tr>
+       {foreach from=$value item=v key=n}
+        <tr>
+         <td {$labelStyle}>
+          {$n}
+         </td>
+         <td {$valueStyle}>
+          {$v}
+         </td>
+        </tr>
+       {/foreach}
+      {/foreach}
+     {/if}
+
+    </table>
+   </td>
+  </tr>
+
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_offline_receipt_text.tpl
new file mode 100644 (file)
index 0000000..ceb48e0
--- /dev/null
@@ -0,0 +1,292 @@
+{contact.email_greeting}
+{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+{$event.confirm_email_text}
+{/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}
+
+==========================================================={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|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 $event.participant_role neq 'Attendee' and $defaultRole}
+{ts}Participant Role{/ts}: {$event.participant_role}
+{/if}
+
+{if $isShowLocation}
+{$location.address.1.display|strip_tags:false}
+{/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 $email}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts}Registered Email{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$email}
+{/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}
+{/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}
+{if $dataArray}
+{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
+{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
+{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
+{/if}
+{capture assign=ts_total}{ts}Total{/ts}{/capture}
+{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture}
+{$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$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|string_format:"%10s"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""}  {$line.tax_rate|string_format:"%.2f"} %  {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else}                  {/if}  {/if}  {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {$ts_participant_count|string_format:"%10s"}
+{/foreach}
+{/if}
+{/foreach}
+
+{if $dataArray}
+{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}
+
+{foreach from=$dataArray item=value key=priceset}
+{if $priceset || $priceset == 0}
+{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency}
+{else}
+{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}
+{/if}
+{/foreach}
+{/if}
+{/if}
+
+{if $amount && !$lineItem}
+{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label}
+{/foreach}
+{/if}
+
+{if $totalTaxAmount}
+{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}
+{/if}
+{if $isPrimary}
+
+{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}
+
+{if $balanceAmount}
+{ts}Balance{/ts}: {$balanceAmount|crmMoney}
+{/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 $is_pay_later }
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$pay_later_receipt}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{/if}
+
+{if $register_date}
+{ts}Registration Date{/ts}: {$register_date|crmDate}
+{/if}
+{if $receive_date}
+{ts}Transaction Date{/ts}: {$receive_date|crmDate}
+{/if}
+{if $financialTypeName}
+{ts}Financial Type{/ts}: {$financialTypeName}
+{/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}
+===========================================================
+{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}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$customPre_grouptitle}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$customPre item=value key=customName}
+{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+{$customName}: {$value}
+{/if}
+{/foreach}
+{/if}
+
+{if $customPost}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{$customPost_grouptitle}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$customPost item=value key=customName}
+{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+{$customName}: {$value}
+{/if}
+{/foreach}
+{/if}
+{if $customProfile}
+
+{foreach from=$customProfile item=value key=customName}
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{ts 1=$customName+1}Participant Information - Participant %1{/ts}
+
+==========================================================={if $pricesetFieldsCount }===================={/if}
+
+{foreach from=$value item=val key=field}
+{if $field eq 'additionalCustomPre' or $field eq 'additionalCustomPost' }
+{if $field eq 'additionalCustomPre' }
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{$additionalCustomPre_grouptitle}
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{else}
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{$additionalCustomPost_grouptitle}
+----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}
+
+{/if}
+{foreach from=$val item=v key=f}
+{$f}: {$v}
+{/foreach}
+{/if}
+{/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.7.11.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_html.tpl
new file mode 100644 (file)
index 0000000..f7ebf36
--- /dev/null
@@ -0,0 +1,514 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+{capture assign=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture}
+{capture assign=tdStyle}style="width: 100px;"{/capture}
+{capture assign=participantTotal}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture}
+
+
+<center>
+ <table width="700" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+  <p>{contact.email_greeting},</p>
+
+    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+     <p>{$event.confirm_email_text|htmlize}</p>
+
+    {else}
+     <p>{ts}Thank you for your participation.{/ts}
+     {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}
+     {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}.</p>
+
+    {/if}
+
+    <p>
+    {if $isOnWaitlist}
+     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>
+     {if $isPrimary}
+       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>
+     {/if}
+    {elseif $isRequireApproval}
+     <p>{ts}Your registration has been submitted.{/ts}</p>
+     {if $isPrimary}
+      <p>{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}</p>
+     {/if}
+    {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}
+     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}
+    {else}
+     <p>{ts}Please print this confirmation for your records.{/ts}</p>
+    {/if}
+
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <table width="700" style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+
+
+     {if $conference_sessions}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+  {ts}Your schedule:{/ts}
+       </td>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+  {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}
+          <em>{$group_by_day|date_format:"%m/%d/%Y"}</em><br />
+   {/if}
+   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
+   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}
+  {/foreach}
+       </td>
+      </tr>
+     {/if}
+
+     {if $event.participant_role neq 'Attendee' and $defaultRole}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Participant Role{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$event.participant_role}
+       </td>
+      </tr>
+     {/if}
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $location.phone.1.phone || $location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}
+           {$phone.phone_type_display}
+          {else}
+           {ts}Phone{/ts}
+          {/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {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}
+        <a href="{$icalFeed}">{ts}Download iCalendar File{/ts}</a>
+       </td>
+      </tr>
+     {/if}
+
+    {if $event.is_share}
+        <tr>
+            <td colspan="2" {$valueStyle}>
+                {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}
+            </td>
+        </tr>
+    {/if}
+    {if $payer.name}
+     <tr>
+       <th {$headerStyle}>
+         {ts}You were registered by:{/ts}
+       </th>
+     </tr>
+     <tr>
+       <td colspan="2" {$valueStyle}>
+        {$payer.name}
+       </td>
+     </tr>
+    {/if}
+    {if $event.is_monetary}
+
+      <tr>
+       <th {$headerStyle}>
+        {$event.fee_label}
+       </th>
+      </tr>
+
+      {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. *}
+           <tr>
+            <td colspan="2" {$labelStyle}>
+             {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}
+            </td>
+           </tr>
+          {/if}
+         {/if}
+         <tr>
+          <td colspan="2" {$valueStyle}>
+           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}
+            <tr>
+             <th>{ts}Item{/ts}</th>
+             <th>{ts}Qty{/ts}</th>
+             <th>{ts}Each{/ts}</th>
+             {if $dataArray}
+              <th>{ts}SubTotal{/ts}</th>
+              <th>{ts}Tax Rate{/ts}</th>
+              <th>{ts}Tax Amount{/ts}</th>
+             {/if}
+             <th>{ts}Total{/ts}</th>
+       {if  $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+            </tr>
+            {foreach from=$value item=line}
+             <tr>
+              <td {$tdfirstStyle}>
+              {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+              </td>
+              <td {$tdStyle} align="middle">
+               {$line.qty}
+              </td>
+              <td {$tdStyle}>
+               {$line.unit_price|crmMoney:$currency}
+              </td>
+              {if $dataArray}
+               <td {$tdStyle}>
+                {$line.unit_price*$line.qty|crmMoney}
+               </td>
+               {if $line.tax_rate != "" || $line.tax_amount != ""}
+                <td {$tdStyle}>
+                 {$line.tax_rate|string_format:"%.2f"}%
+                </td>
+                <td {$tdStyle}>
+                 {$line.tax_amount|crmMoney}
+                </td>
+               {else}
+                <td></td>
+                <td></td>
+               {/if}
+              {/if}
+              <td {$tdStyle}>
+               {$line.line_total+$line.tax_amount|crmMoney:$currency}
+              </td>
+        {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}
+             </tr>
+            {/foreach}
+            {if $individual}
+              <tr {$participantTotal}>
+                <td colspan=3>{ts}Participant Total{/ts}</td>
+                <td  colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>
+                <td  colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>
+                <td  colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>
+              </tr>
+            {/if}
+           </table>
+          </td>
+         </tr>
+        {/if}
+       {/foreach}
+       {if $dataArray}
+        <tr>
+         <td {$labelStyle}>
+          {ts} Amount Before Tax: {/ts}
+         </td>
+         <td {$valueStyle}>
+          {$totalAmount-$totalTaxAmount|crmMoney}
+         </td>
+        </tr>
+        {foreach from=$dataArray item=value key=priceset}
+         <tr>
+          {if $priceset || $priceset == 0}
+           <td>&nbsp;{$taxTerm} {$priceset|string_format:"%.2f"}%</td>
+           <td>&nbsp;{$value|crmMoney:$currency}</td>
+          {else}
+           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>
+           <td>&nbsp;{$value|crmMoney:$currency}</td>
+          {/if}
+         </tr>
+        {/foreach}
+       {/if}
+      {/if}
+
+      {if $amounts && !$lineItem}
+       {foreach from=$amounts item=amnt key=level}
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$amnt.amount|crmMoney:$currency} {$amnt.label}
+         </td>
+        </tr>
+       {/foreach}
+      {/if}
+
+    {if $totalTaxAmount}
+       <tr>
+        <td {$labelStyle}>
+         {ts}Total Tax Amount{/ts}
+        </td>
+        <td {$valueStyle}>
+         {$totalTaxAmount|crmMoney:$currency}
+        </td>
+       </tr>
+      {/if}
+      {if $isPrimary}
+       <tr>
+        <td {$labelStyle}>
+         {ts}Total Amount{/ts}
+        </td>
+        <td {$valueStyle}>
+         {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}
+        </td>
+       </tr>
+       {if $pricesetFieldsCount }
+     <tr>
+       <td {$labelStyle}>
+      {ts}Total Participants{/ts}</td>
+      <td {$valueStyle}>
+      {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}
+     </td> </tr>
+      {/if}
+
+       {if $register_date}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Registration Date{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$register_date|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+       {if $receive_date}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Transaction Date{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$receive_date|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+       {if $financialTypeName}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Financial Type{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$financialTypeName}
+         </td>
+        </tr>
+       {/if}
+
+       {if $trxn_id}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Transaction #{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$trxn_id}
+         </td>
+        </tr>
+       {/if}
+
+       {if $paidBy}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Paid By{/ts}
+         </td>
+         <td {$valueStyle}>
+         {$paidBy}
+         </td>
+        </tr>
+       {/if}
+
+       {if $checkNumber}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Check Number{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$checkNumber}
+         </td>
+        </tr>
+       {/if}
+
+       {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval}
+        <tr>
+         <th {$headerStyle}>
+          {ts}Billing Name and Address{/ts}
+         </th>
+        </tr>
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$billingName}<br />
+          {$address|nl2br}
+         </td>
+        </tr>
+       {/if}
+
+       {if $contributeMode eq 'direct' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+        <tr>
+         <th {$headerStyle}>
+          {ts}Credit Card Information{/ts}
+         </th>
+        </tr>
+        <tr>
+         <td colspan="2" {$valueStyle}>
+          {$credit_card_type}<br />
+          {$credit_card_number}<br />
+          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+         </td>
+        </tr>
+       {/if}
+
+      {/if}
+
+     {/if} {* End of conditional section for Paid events *}
+
+
+{if $customPre}
+{foreach from=$customPre item=customPr key=i}
+   <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>
+   {foreach from=$customPr item=customValue key=customName}
+   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+     <tr>
+         <td {$labelStyle}>{$customName}</td>
+         <td {$valueStyle}>{$customValue}</td>
+     </tr>
+   {/if}
+   {/foreach}
+{/foreach}
+{/if}
+
+{if $customPost}
+{foreach from=$customPost item=customPos key=j}
+   <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>
+   {foreach from=$customPos item=customValue key=customName}
+   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}
+     <tr>
+         <td {$labelStyle}>{$customName}</td>
+         <td {$valueStyle}>{$customValue}</td>
+     </tr>
+{/if}
+{/foreach}
+{/foreach}
+{/if}
+
+{if $customProfile}
+{foreach from=$customProfile.profile item=eachParticipant key=participantID}
+     <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>
+     {foreach from=$eachParticipant item=eachProfile key=pid}
+     <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>
+     {foreach from=$eachProfile item=val key=field}
+     <tr>{foreach from=$val item=v key=f}
+         <td {$labelStyle}>{$field}</td>
+         <td {$valueStyle}>{$v}</td>
+         {/foreach}
+     </tr>
+     {/foreach}
+{/foreach}
+{/foreach}
+{/if}
+
+    {if $customGroup}
+      {foreach from=$customGroup item=value key=customName}
+       <tr>
+        <th {$headerStyle}>
+         {$customName}
+        </th>
+       </tr>
+       {foreach from=$value item=v key=n}
+        <tr>
+         <td {$labelStyle}>
+          {$n}
+         </td>
+         <td {$valueStyle}>
+          {$v}
+         </td>
+        </tr>
+       {/foreach}
+      {/foreach}
+     {/if}
+    </table>
+    {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}
+   </td>
+  </tr>
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_online_receipt_text.tpl
new file mode 100644 (file)
index 0000000..b0233b4
--- /dev/null
@@ -0,0 +1,302 @@
+{contact.email_greeting},
+
+{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}
+{$event.confirm_email_text}
+
+{else}
+  {ts}Thank you for your participation.{/ts}
+  {if $participant_status}{ts 1=$participant_status}This letter is a confirmation that your registration has been received and your status has been updated to %1.{/ts}
+  {else}{if $isOnWaitlist}{ts}This letter is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This letter is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/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}
+{$location.address.1.display|strip_tags:false}
+{/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}
+{if $dataArray}
+{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}
+{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}
+{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}
+{/if}
+{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"} {if $dataArray} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$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"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate != "" || $line.tax_amount != ""}  {$line.tax_rate|string_format:"%.2f"} %  {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"}{$ts_participant_count|string_format:"%10s"}
+{/foreach}
+----------------------------------------------------------------------------------------------------------------
+{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%29s"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:"%33s"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:"%12s"}{/if}
+{/if}
+{""|string_format:"%120s"}
+{/foreach}
+{""|string_format:"%120s"}
+
+{if $dataArray}
+{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}
+
+{foreach from=$dataArray item=value key=priceset}
+{if $priceset || $priceset == 0}
+{$taxTerm} {$priceset|string_format:"%.2f"}%: {$value|crmMoney:$currency}
+{else}
+{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}
+{/if}
+{/foreach}
+{/if}
+{/if}
+
+{if $amounts && !$lineItem}
+{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}
+{/foreach}
+{/if}
+
+{if $totalTaxAmount}
+{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}
+{/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 $financialTypeName}
+{ts}Financial Type{/ts}: {$financialTypeName}
+{/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 or $isBillingAddressRequiredForPayLater) 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}
+
+{if $event.allow_selfcancelxfer }
+{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}
+   {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
+{ts}Transfer or cancel your registration:{/ts} {$selfService}
+{/if}
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_html.tpl
new file mode 100644 (file)
index 0000000..3436a19
--- /dev/null
@@ -0,0 +1,175 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title></title>
+  </head>
+  <body>
+    {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}
+
+    <p>Dear {contact.display_name},</p>
+    {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.
+      </p>
+    {else}
+      <p>
+        This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.
+      </p>
+    {/if}
+
+    {if $is_pay_later}
+      <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}
+  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>
+    <th style="text-align: left;">
+      {ts}Billing Name and Address{/ts}
+    </th>
+      </tr>
+      <tr>
+    <td>
+      {$billing_name}<br />
+      {$billing_street_address}<br />
+      {$billing_city}, {$billing_state} {$billing_postal_code}<br/>
+      <br/>
+      {$email}
+    </td>
+    </tr>
+    </table>
+{/if}
+{if $credit_card_type}
+  <p>&nbsp;</p>
+  <table class="billing-info">
+      <tr>
+    <th style="text-align: left;">
+      {ts}Credit Card Information{/ts}
+    </th>
+      </tr>
+      <tr>
+    <td>
+      {$credit_card_type}<br />
+      {$credit_card_number}<br />
+      {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}
+    </td>
+    </tr>
+    </table>
+{/if}
+{if $source}
+    <p>&nbsp;</p>
+    {$source}
+{/if}
+    <p>&nbsp;</p>
+    <table width="600">
+      <thead>
+    <tr>
+{if $line_items}
+      <th style="text-align: left;">
+      Event
+      </th>
+      <th style="text-align: left;">
+      Participants
+      </th>
+{/if}
+      <th style="text-align: left;">
+      Price
+      </th>
+      <th style="text-align: left;">
+      Total
+      </th>
+    </tr>
+    </thead>
+      <tbody>
+  {foreach from=$line_items item=line_item}
+  <tr>
+    <td style="width: 220px">
+      {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})<br />
+      {if $line_item.event->is_show_location}
+        {$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>
+    <td style="width: 180px">
+    {$line_item.num_participants}
+      {if $line_item.num_participants > 0}
+      <div class="participants" style="padding-left: 10px;">
+        {foreach from=$line_item.participants item=participant}
+        {$participant.display_name}<br />
+        {/foreach}
+      </div>
+      {/if}
+      {if $line_item.num_waiting_participants > 0}
+      Waitlisted:<br/>
+      <div class="participants" style="padding-left: 10px;">
+        {foreach from=$line_item.waiting_participants item=participant}
+        {$participant.display_name}<br />
+        {/foreach}
+      </div>
+      {/if}
+    </td>
+    <td style="width: 100px">
+      {$line_item.cost|crmMoney:$currency|string_format:"%10s"}
+    </td>
+    <td style="width: 100px">
+      &nbsp;{$line_item.amount|crmMoney:$currency|string_format:"%10s"}
+    </td>
+  </tr>
+  {/foreach}
+      </tbody>
+      <tfoot>
+  {if $discounts}
+  <tr>
+    <td>
+    </td>
+    <td>
+    </td>
+    <td>
+      Subtotal:
+    </td>
+    <td>
+      &nbsp;{$sub_total|crmMoney:$currency|string_format:"%10s"}
+    </td>
+  </tr>
+  {foreach from=$discounts key=myId item=i}
+  <tr>
+    <td>
+      {$i.title}
+    </td>
+    <td>
+    </td>
+    <td>
+    </td>
+    <td>
+      -{$i.amount}
+    </td>
+  </tr>
+  {/foreach}
+  {/if}
+  <tr>
+{if $line_items}
+    <td>
+    </td>
+    <td>
+    </td>
+{/if}
+    <td>
+      <strong>Total:</strong>
+    </td>
+    <td>
+      <strong>&nbsp;{$total|crmMoney:$currency|string_format:"%10s"}</strong>
+    </td>
+  </tr>
+      </tfoot>
+    </table>
+
+    If you have questions about the status of your registration or purchase please feel free to contact us.
+  </body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/event_registration_receipt_text.tpl
new file mode 100644 (file)
index 0000000..695b53d
--- /dev/null
@@ -0,0 +1,80 @@
+Dear {contact.display_name},
+{if $is_pay_later}
+  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.
+{else}
+  This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.
+{/if}
+
+{if $is_pay_later}
+  {$pay_later_receipt}
+{/if}
+
+  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}
+ Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}:
+
+{if $billing_name}
+===========================================================
+{ts}Billing Name and Address{/ts}
+
+===========================================================
+{$billing_name}
+
+{$billing_street_address}
+
+{$billing_city}, {$billing_state} {$billing_postal_code}
+
+{$email}
+{/if}
+
+{if $source}
+{$source}
+{/if}
+
+
+{foreach from=$line_items item=line_item}
+{$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
+{if $line_item.event->is_show_location}
+  {$line_item.location.address.1.display|strip_tags:false}
+{/if}{*End of isShowLocation condition*}
+{$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
+
+  Quantity: {$line_item.num_participants}
+
+{if $line_item.num_participants > 0}
+  {foreach from=$line_item.participants item=participant}
+    {$participant.display_name}
+  {/foreach}
+{/if}
+{if $line_item.num_waiting_participants > 0}
+  Waitlisted:
+    {foreach from=$line_item.waiting_participants item=participant}
+      {$participant.display_name}
+    {/foreach}
+{/if}
+Cost: {$line_item.cost|crmMoney:$currency|string_format:"%10s"}
+Total For This Event: {$line_item.amount|crmMoney:$currency|string_format:"%10s"}
+
+{/foreach}
+
+{if $discounts}
+Subtotal: {$sub_total|crmMoney:$currency|string_format:"%10s"}
+--------------------------------------
+Discounts
+{foreach from=$discounts key=myId item=i}
+  {$i.title}: -{$i.amount|crmMoney:$currency|string_format:"%10s"}
+{/foreach}
+{/if}
+======================================
+Total: {$total|crmMoney:$currency|string_format:"%10s"}
+
+{if $credit_card_type}
+===========================================================
+{ts}Payment Information{/ts}
+
+===========================================================
+{$credit_card_type}
+{$credit_card_number}
+{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}
+{/if}
+
+  If you have questions about the status of your registration or purchase please feel free to contact us.
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_html.tpl
new file mode 100644 (file)
index 0000000..4a882c1
--- /dev/null
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+    <p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
+    <p>{ts}Your Event Registration has been cancelled.{/ts}</p>
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+     <tr>
+      <td {$labelStyle}>
+       {ts}Participant Role{/ts}:
+      </td>
+      <td {$valueStyle}>
+       {$participant.role}
+      </td>
+     </tr>
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$event.location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $event.location.phone.1.phone || $event.location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$event.location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$event.location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {if $contact.email}
+      <tr>
+       <th {$headerStyle}>
+        {ts}Registered Email{/ts}
+       </th>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$contact.email}
+       </td>
+      </tr>
+     {/if}
+
+     {if $register_date}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Registration Date{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$participant.register_date|crmDate}
+       </td>
+      </tr>
+     {/if}
+
+    </table>
+   </td>
+  </tr>
+
+  <tr>
+   <td>
+    <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>
+
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_cancelled_text.tpl
new file mode 100644 (file)
index 0000000..b4430b3
--- /dev/null
@@ -0,0 +1,47 @@
+{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}
+{$event.location.address.1.display|strip_tags:false}
+{/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.7.11.msg_template/message_templates/participant_confirm_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_html.tpl
new file mode 100644 (file)
index 0000000..ca6816d
--- /dev/null
@@ -0,0 +1,184 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+    <p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
+   </td>
+  </tr>
+  {if !$isAdditional and $participant.id}
+   <tr>
+    <th {$headerStyle}>
+     {ts}Confirm Your Registration{/ts}
+    </th>
+   </tr>
+   <tr>
+    <td colspan="2" {$valueStyle}>
+     {capture assign=confirmUrl}{crmURL p='civicrm/event/confirm' q="reset=1&participantId=`$participant.id`&cs=`$checksumValue`" a=true h=0 fe=1}{/capture}
+     <a href="{$confirmUrl}">Go to a web page where you can confirm your registration online</a>
+    </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%;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+     {if $conference_sessions}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+  {ts}Your schedule:{/ts}
+       </td>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+  {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}
+          <em>{$group_by_day|date_format:"%m/%d/%Y"}</em><br />
+   {/if}
+   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
+   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}
+  {/foreach}
+       </td>
+      </tr>
+     {/if}
+     <tr>
+      <td {$labelStyle}>
+       {ts}Participant Role{/ts}:
+      </td>
+      <td {$valueStyle}>
+       {$participant.role}
+      </td>
+     </tr>
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$event.location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $event.location.phone.1.phone || $event.location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$event.location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$event.location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {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}
+        <a href="{$icalFeed}">{ts}Download iCalendar File{/ts}</a>
+       </td>
+      </tr>
+     {/if}
+
+     {if $contact.email}
+      <tr>
+       <th {$headerStyle}>
+        {ts}Registered Email{/ts}
+       </th>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$contact.email}
+       </td>
+      </tr>
+     {/if}
+
+     {if $register_date}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Registration Date{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$participant.register_date|crmDate}
+       </td>
+      </tr>
+     {/if}
+
+    </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 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>
+
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_confirm_text.tpl
new file mode 100644 (file)
index 0000000..e8f9013
--- /dev/null
@@ -0,0 +1,81 @@
+{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}
+{if $event.allow_selfcancelxfer }
+{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}
+   {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
+{ts}Transfer or cancel your registration:{/ts} {$selfService}
+{/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}
+{$event.location.address.1.display|strip_tags:false}
+{/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.7.11.msg_template/message_templates/participant_expired_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_html.tpl
new file mode 100644 (file)
index 0000000..a11ff72
--- /dev/null
@@ -0,0 +1,132 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+    <p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
+    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired
+because you did not confirm your registration.{/ts}</p>
+    <p>{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}</p>
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+     <tr>
+      <td {$labelStyle}>
+       {ts}Participant Role{/ts}:
+      </td>
+      <td {$valueStyle}>
+       {$participant.role}
+      </td>
+     </tr>
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$event.location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $event.location.phone.1.phone || $event.location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$event.location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$event.location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {if $contact.email}
+      <tr>
+       <th {$headerStyle}>
+        {ts}Registered Email{/ts}
+       </th>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$contact.email}
+       </td>
+      </tr>
+     {/if}
+
+     {if $register_date}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Registration Date{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$participant.register_date|crmDate}
+       </td>
+      </tr>
+     {/if}
+
+    </table>
+   </td>
+  </tr>
+
+  <tr>
+   <td>
+    <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>
+
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_expired_text.tpl
new file mode 100644 (file)
index 0000000..be649c1
--- /dev/null
@@ -0,0 +1,51 @@
+{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}
+{$event.location.address.1.display|strip_tags:false}
+{/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.7.11.msg_template/message_templates/participant_transferred_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_html.tpl
new file mode 100644 (file)
index 0000000..26cbf37
--- /dev/null
@@ -0,0 +1,129 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+   <td>
+    <p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
+    <p>{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}</p>
+   </td>
+  </tr>
+  <tr>
+   <td>
+    <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+     <tr>
+      <th {$headerStyle}>
+       {ts}Event Information and Location{/ts}
+      </th>
+     </tr>
+     <tr>
+      <td colspan="2" {$valueStyle}>
+       {$event.event_title}<br />
+       {$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}
+      </td>
+     </tr>
+     <tr>
+      <td {$labelStyle}>
+       {ts}Participant Role{/ts}:
+      </td>
+      <td {$valueStyle}>
+       {$participant.role}
+      </td>
+     </tr>
+
+     {if $isShowLocation}
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$event.location.address.1.display|nl2br}
+       </td>
+      </tr>
+     {/if}
+
+     {if $event.location.phone.1.phone || $event.location.email.1.email}
+      <tr>
+       <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+       </td>
+      </tr>
+      {foreach from=$event.location.phone item=phone}
+       {if $phone.phone}
+        <tr>
+         <td {$labelStyle}>
+          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}
+         </td>
+         <td {$valueStyle}>
+          {$phone.phone}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+      {foreach from=$event.location.email item=eventEmail}
+       {if $eventEmail.email}
+        <tr>
+         <td {$labelStyle}>
+          {ts}Email{/ts}
+         </td>
+         <td {$valueStyle}>
+          {$eventEmail.email}
+         </td>
+        </tr>
+       {/if}
+      {/foreach}
+     {/if}
+
+     {if $contact.email}
+      <tr>
+       <th {$headerStyle}>
+        {ts}Registered Email{/ts}
+       </th>
+      </tr>
+      <tr>
+       <td colspan="2" {$valueStyle}>
+        {$contact.email}
+       </td>
+      </tr>
+     {/if}
+
+     {if $register_date}
+      <tr>
+       <td {$labelStyle}>
+        {ts}Registration Date{/ts}
+       </td>
+       <td {$valueStyle}>
+        {$participant.register_date|crmDate}
+       </td>
+      </tr>
+     {/if}
+
+    </table>
+   </td>
+  </tr>
+
+  <tr>
+   <td>
+    <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>
+
+ </table>
+</center>
+
+</body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/participant_transferred_text.tpl
new file mode 100644 (file)
index 0000000..aeac8a7
--- /dev/null
@@ -0,0 +1,45 @@
+{ts 1=$contact.display_name}Dear %1{/ts},
+
+{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/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}
+{$event.location.address.1.display|strip_tags:false}
+{/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.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_html.tpl
new file mode 100644 (file)
index 0000000..6d6efeb
--- /dev/null
@@ -0,0 +1,255 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title></title>
+</head>
+<body>
+
+{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}
+{capture assign=emptyBlockStyle }style="padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;"{/capture}
+{capture assign=emptyBlockValueStyle }style="padding: 10px; border-bottom: 1px solid #999;"{/capture}
+
+<p>Dear {$contactDisplayName}</p>
+<center>
+ <table width="620" border="0" cellpadding="0" cellspacing="0" id="crm-event_receipt" style="font-family: Arial, Verdana, sans-serif; text-align: left;">
+
+  <!-- BEGIN HEADER -->
+  <!-- You can add table row(s) here with logo or other header elements -->
+  <!-- END HEADER -->
+
+  <!-- BEGIN CONTENT -->
+
+  <tr>
+    <td>
+      {if $paymentConfig.confirm_email_text}
+      <p>{$paymentConfig.confirm_email_text|htmlize}</p>
+      {elseif $isRefund}
+      <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>
+      {else}
+      <p>{ts}A payment has been received.{/ts}</p>
+      {/if}
+      <p>{ts}Please print this confirmation for your records.{/ts}</p>
+    </td>
+  </tr>
+  <tr>
+   <td>
+    <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+  {if $isRefund}
+  <tr>
+    <th {$headerStyle}>{ts}Refund Details{/ts}</th>
+  </tr>
+  <tr>
+    <td {$labelStyle}>
+      {ts}Total Fees{/ts}
+    </td>
+    <td {$valueStyle}>
+      {$totalAmount|crmMoney}
+    </td>
+  </tr>
+  <tr>
+    <td {$labelStyle}>
+      {ts}You Paid{/ts}
+    </td>
+    <td {$valueStyle}>
+      {$totalPaid|crmMoney}
+    </td>
+  </tr>
+  <tr>
+    <td {$labelStyle}>
+      {ts}Refund Amount{/ts}
+    </td>
+    <td {$valueStyle}>
+      {$refundAmount|crmMoney}
+    <td>
+  </tr>
+  {else}
+    <tr>
+      <th {$headerStyle}>{ts}Payment Details{/ts}</th>
+    </tr>
+    <tr>
+      <td {$labelStyle}>
+  {ts}{if $component eq 'event'}Total Fees{/if}{/ts}
+      </td>
+      <td {$valueStyle}>
+  {$totalAmount|crmMoney}
+      </td>
+      </tr>
+      <tr>
+      <td {$labelStyle}>
+  {ts}This Payment Amount{/ts}
+      </td>
+      <td {$valueStyle}>
+  {$paymentAmount|crmMoney}
+      </td>
+      </tr>
+     <tr>
+      <td {$labelStyle}>
+  {ts}Balance Owed{/ts}
+      </td>
+       <td {$valueStyle}>
+  {$amountOwed|crmMoney}
+      </td> {* This will be zero after final payment. *}
+     </tr>
+     <tr> <td {$emptyBlockStyle}></td>
+     <td {$emptyBlockValueStyle}></td></tr>
+      {if $paymentsComplete}
+      <tr>
+      <td colspan='2' {$valueStyle}>
+  {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts}
+      </td>
+     </tr>
+      {/if}
+  {/if}
+  {if $receive_date}
+    <tr>
+      <td {$labelStyle}>
+  {ts}Transaction Date{/ts}
+      </td>
+      <td {$valueStyle}>
+  {$receive_date|crmDate}
+      </td>
+    </tr>
+  {/if}
+  {if $trxn_id}
+    <tr>
+      <td {$labelStyle}>
+  {ts}Transaction #{/ts}
+      </td>
+      <td {$valueStyle}>
+        {$trxn_id}
+      </td>
+    </tr>
+  {/if}
+  {if $paidBy}
+    <tr>
+      <td {$labelStyle}>
+        {ts}Paid By{/ts}
+      </td>
+      <td {$valueStyle}>
+        {$paidBy}
+      </td>
+    </tr>
+  {/if}
+  {if $checkNumber}
+    <tr>
+      <td {$labelStyle}>
+        {ts}Check Number{/ts}
+      </td>
+      <td {$valueStyle}>
+        {$checkNumber}
+      </td>
+    </tr>
+  {/if}
+  </table>
+  </td>
+  </tr>
+    <tr>
+      <td>
+  <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
+    {if $contributeMode eq 'direct' and !$isAmountzero}
+          <tr>
+            <th {$headerStyle}>
+        {ts}Billing Name and Address{/ts}
+            </th>
+          </tr>
+          <tr>
+            <td colspan="2" {$valueStyle}>
+        {$billingName}<br />
+        {$address|nl2br}
+            </td>
+          </tr>
+    {/if}
+    {if $contributeMode eq'direct' and !$isAmountzero}
+          <tr>
+            <th {$headerStyle}>
+        {ts}Credit Card Information{/ts}
+            </th>
+          </tr>
+          <tr>
+            <td colspan="2" {$valueStyle}>
+        {$credit_card_type}<br />
+        {$credit_card_number}<br />
+        {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate}
+            </td>
+          </tr>
+    {/if}
+    {if $component eq 'event'}
+    <tr>
+      <th {$headerStyle}>
+        {ts}Event Information and Location{/ts}
+      </th>
+    </tr>
+    <tr>
+      <td colspan="2" {$valueStyle}>
+         {$event.event_title}<br />
+        {$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}
+      </td>
+    </tr>
+
+    {if $event.participant_role neq 'Attendee' and $defaultRole}
+    <tr>
+      <td {$labelStyle}>
+        {ts}Participant Role{/ts}
+      </td>
+      <td {$valueStyle}>
+        {$event.participant_role}
+      </td>
+    </tr>
+    {/if}
+
+    {if $isShowLocation}
+    <tr>
+      <td colspan="2" {$valueStyle}>
+        {$location.address.1.display|nl2br}
+      </td>
+    </tr>
+    {/if}
+
+    {if $location.phone.1.phone || $location.email.1.email}
+    <tr>
+      <td colspan="2" {$labelStyle}>
+        {ts}Event Contacts:{/ts}
+      </td>
+    </tr>
+    {foreach from=$location.phone item=phone}
+    {if $phone.phone}
+          <tr>
+            <td {$labelStyle}>
+        {if $phone.phone_type}
+        {$phone.phone_type_display}
+        {else}
+        {ts}Phone{/ts}
+        {/if}
+            </td>
+            <td {$valueStyle}>
+        {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}
+            </td>
+          </tr>
+    {/if}
+    {/foreach}
+    {foreach from=$location.email item=eventEmail}
+    {if $eventEmail.email}
+          <tr>
+            <td {$labelStyle}>
+        {ts}Email{/ts}
+            </td>
+            <td {$valueStyle}>
+        {$eventEmail.email}
+            </td>
+          </tr>
+    {/if}
+    {/foreach}
+    {/if} {*phone block close*}
+    {/if}
+  </table>
+      </td>
+    </tr>
+
+    </table>
+  </center>
+
+ </body>
+</html>
diff --git a/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl b/CRM/Upgrade/4.7.11.msg_template/message_templates/payment_or_refund_notification_text.tpl
new file mode 100644 (file)
index 0000000..a09ad9e
--- /dev/null
@@ -0,0 +1,104 @@
+Dear {$contactDisplayName}
+{if $paymentConfig.confirm_email_text}
+{$paymentConfig.confirm_email_text}
+{elseif $isRefund}
+{ts}A refund has been issued based on changes in your registration selections.{/ts}
+{else}
+{ts}A payment has been received.{/ts}
+{/if}
+
+{ts}Please print this confirmation for your records.{/ts}
+
+{if $isRefund}
+===============================================================================
+
+{ts}Refund Details{/ts}
+
+===============================================================================
+{ts}Total Fees{/ts}: {$totalAmount|crmMoney}
+{ts}You Paid{/ts}: {$totalPaid|crmMoney}
+------------------------------------------------------------------------------------
+{ts}Refund Amount{/ts}: {$refundAmount|crmMoney}
+
+{else}
+===============================================================================
+
+{ts}Payment Details{/ts}
+
+===============================================================================
+{ts}Total Fees{/ts}: {$totalAmount|crmMoney}
+{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney}
+------------------------------------------------------------------------------------
+{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}
+
+{if $paymentsComplete}
+
+{ts}Thank-you. This completes your payment for {/ts}{if $component eq 'event'}{$event.event_title}{/if}.
+{/if}
+{/if}
+{if $receive_date}
+{ts}Transaction Date{/ts}: {$receive_date|crmDate}
+{/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 eq 'direct' and !$isAmountzero}
+
+===============================================================================
+
+{ts}Billing Name and Address{/ts}
+
+===============================================================================
+
+{$billingName}
+{$address}
+{/if}
+
+{if $contributeMode eq 'direct' and !$isAmountzero}
+===========================================================
+{ts}Credit Card Information{/ts}
+
+===============================================================================
+
+{$credit_card_type}
+{$credit_card_number}
+{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+{/if}
+{if $component eq 'event'}
+===============================================================================
+
+{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 $event.participant_role neq 'Attendee' and $defaultRole}
+{ts}Participant Role{/ts}: {$event.participant_role}
+{/if}
+
+{if $isShowLocation}
+{$location.address.1.display|strip_tags:false}
+{/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}
index cec120984c972ac50d393d5af4227e7546766954..f61c3ac6ffa460e7bc99f43a294d77313530bc02 100644 (file)
@@ -7,3 +7,6 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
   (NULL, 1076, "GF", "Guyane"),
   (NULL, 1076, "RE", "La RĂ©union"),
   (NULL, 1076, "YT", "Mayotte");
+
+-- CRM-18508 Display State/Province in event address in registration emails
+{include file='../CRM/Upgrade/4.7.11.msg_template/civicrm_msg_template.tpl'}
\ No newline at end of file
index 56159a7aea563d9e7633a41514758ceccd79c022..3436a1903486a05e25bda1a94936b708f1cbb498 100644 (file)
     <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>
index 9620798772d80e3304c8bb5d7fd6986850bc17bb..695b53d60432e6eea04eda09425abe997d2baf8c 100644 (file)
@@ -34,21 +34,7 @@ Dear {contact.display_name},
 {foreach from=$line_items item=line_item}
 {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
 {if $line_item.event->is_show_location}
-  {if $line_item.location.address.1.name}
-    {$line_item.location.address.1.name}
-  {/if}
-  {if $line_item.location.address.1.street_address}
-    {$line_item.location.address.1.street_address}
-  {/if}
-  {if $line_item.location.address.1.supplemental_address_1}
-    {$line_item.location.address.1.supplemental_address_1}
-  {/if}
-  {if $line_item.location.address.1.supplemental_address_2}
-    {$line_item.location.address.1.supplemental_address_2}
-  {/if}
-  {if $line_item.location.address.1.city}
-    {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$line_item.location.address.1.postal_code}
-  {/if}
+  {$line_item.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
 
index d7af3a78595f3326dbc0127b31da7f4d343b1a70..4a882c1259b3ffafc0689510ab80a1ca95556d25 100644 (file)
      {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}
index f79abd2c02b879874df2ba6af0c5196a5f6b6341..b4430b33d19437bf5f9f81541aec0df07298df97 100644 (file)
 {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}
-
+{$event.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $event.location.phone.1.phone || $event.location.email.1.email}
index 7585ee306f833e0c888f430d27013682908e4363..ca6816d166f356b170afde10b4101951e6500e64 100644 (file)
      {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}
index cb4795b824f1e028988a3a2aa65c34b28d8754bd..e8f90132b5c11c86825cde4be295473472ef0946 100644 (file)
@@ -42,19 +42,7 @@ Click this link to go to a web page where you can confirm your registration onli
 {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}
-
+{$event.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $event.location.phone.1.phone || $event.location.email.1.email}
index ca2621f9e5cec7bdb69d51b9fb55c1e222fb2d69..a11ff72685cfede07dcb6f603e31f72184dd7e6f 100644 (file)
@@ -54,24 +54,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      {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}
index 534c1c6578fcd90785d902e2b07e6ce419060325..be649c11daee52728357834f9184b820c98e9b20 100644 (file)
@@ -17,19 +17,7 @@ or want to inquire about reinstating your registration for this event.{/ts}
 {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}
-
+{$event.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $event.location.phone.1.phone || $event.location.email.1.email}
index efb55af315f7f116023e7de12b5c5ae4e2329bd9..26cbf37e1524c454e1cdc2196220591e62353fe0 100644 (file)
      {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}
index 6c50c9b4508168134e79b9ad18d33fca8c30974b..aeac8a7ba15952a8a7937ba2c184029e6d65bfb1 100644 (file)
 {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}
-
+{$event.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $event.location.phone.1.phone || $event.location.email.1.email}
index 56d344d311144caa7783168e81002f3553c2f0b8..6d6efeb52de3d48694e9385a40ab94250aa34fce 100644 (file)
     {if $isShowLocation}
     <tr>
       <td colspan="2" {$valueStyle}>
-        {if $location.address.1.name}
-        {$location.address.1.name}<br />
-        {/if}
-        {if $location.address.1.street_address}
-        {$location.address.1.street_address}<br />
-        {/if}
-        {if $location.address.1.supplemental_address_1}
-        {$location.address.1.supplemental_address_1}<br />
-        {/if}
-        {if $location.address.1.supplemental_address_2}
-        {$location.address.1.supplemental_address_2}<br />
-        {/if}
-        {if $location.address.1.city}
-        {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}<br />
-        {/if}
+        {$location.address.1.display|nl2br}
       </td>
     </tr>
     {/if}
index 35a37f5e5f7ed12b6ee15a67bcf4c3007e43a334..a09ad9e162a85479edd2414548b3c93873994ef7 100644 (file)
@@ -85,19 +85,7 @@ Dear {$contactDisplayName}
 {/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.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
-{/if}
-
+{$location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $location.phone.1.phone || $location.email.1.email}