Skip to content
Snippets Groups Projects
Unverified Commit c9496bc6 authored by Eileen McNaughton's avatar Eileen McNaughton Committed by GitHub
Browse files

Merge pull request #15491 from magnolia61/Additional_Email_Greetings_in_workflow_message_templates 

#781 Additional email greetings in message templates
parents 775418e6 56658066
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 109 additions and 23 deletions
CRM/Upgrade/Incremental/MessageTemplates.php
+ 79
− 0
View file @ c9496bc6
......@@ -121,6 +121,85 @@ class CRM_Upgrade_Incremental_MessageTemplates {
['name' => 'pledge_acknowledge', 'type' => 'html'],
],
],
[
'version' => '5.20.alpha1',
'upgrade_descriptor' => ts('Fix missing Email greetings'),
'templates' => [
['name' => 'contribution_dupalert', 'type' => 'subject'],
['name' => 'contribution_invoice_receipt', 'type' => 'subject'],
['name' => 'contribution_offline_receipt', 'type' => 'html'],
['name' => 'contribution_offline_receipt', 'type' => 'subject'],
['name' => 'contribution_offline_receipt', 'type' => 'text'],
['name' => 'contribution_online_receipt', 'type' => 'subject'],
['name' => 'contribution_recurring_billing', 'type' => 'html'],
['name' => 'contribution_recurring_billing', 'type' => 'subject'],
['name' => 'contribution_recurring_billing', 'type' => 'text'],
['name' => 'contribution_recurring_cancelled', 'type' => 'html'],
['name' => 'contribution_recurring_cancelled', 'type' => 'subject'],
['name' => 'contribution_recurring_cancelled', 'type' => 'text'],
['name' => 'contribution_recurring_edit', 'type' => 'html'],
['name' => 'contribution_recurring_edit', 'type' => 'subject'],
['name' => 'contribution_recurring_edit', 'type' => 'text'],
['name' => 'contribution_recurring_notify', 'type' => 'html'],
['name' => 'contribution_recurring_notify', 'type' => 'subject'],
['name' => 'contribution_recurring_notify', 'type' => 'text'],
['name' => 'event_offline_receipt', 'type' => 'html'],
['name' => 'event_offline_receipt', 'type' => 'subject'],
['name' => 'event_offline_receipt', 'type' => 'text'],
['name' => 'event_online_receipt', 'type' => 'html'],
['name' => 'event_online_receipt', 'type' => 'subject'],
['name' => 'event_online_receipt', 'type' => 'text'],
['name' => 'event_registration_receipt', 'type' => 'html'],
['name' => 'event_registration_receipt', 'type' => 'subject'],
['name' => 'event_registration_receipt', 'type' => 'text'],
['name' => 'membership_autorenew_billing', 'type' => 'html'],
['name' => 'membership_autorenew_billing', 'type' => 'subject'],
['name' => 'membership_autorenew_billing', 'type' => 'text'],
['name' => 'membership_autorenew_cancelled', 'type' => 'html'],
['name' => 'membership_autorenew_cancelled', 'type' => 'subject'],
['name' => 'membership_autorenew_cancelled', 'type' => 'text'],
['name' => 'membership_offline_receipt', 'type' => 'html'],
['name' => 'membership_offline_receipt', 'type' => 'subject'],
['name' => 'membership_offline_receipt', 'type' => 'text'],
['name' => 'membership_online_receipt', 'type' => 'subject'],
['name' => 'participant_cancelled', 'type' => 'html'],
['name' => 'participant_cancelled', 'type' => 'subject'],
['name' => 'participant_cancelled', 'type' => 'text'],
['name' => 'participant_confirm', 'type' => 'html'],
['name' => 'participant_confirm', 'type' => 'subject'],
['name' => 'participant_confirm', 'type' => 'text'],
['name' => 'participant_expired', 'type' => 'html'],
['name' => 'participant_expired', 'type' => 'subject'],
['name' => 'participant_expired', 'type' => 'text'],
['name' => 'participant_transferred', 'type' => 'html'],
['name' => 'participant_transferred', 'type' => 'subject'],
['name' => 'participant_transferred', 'type' => 'text'],
['name' => 'payment_or_refund_notification', 'type' => 'html'],
['name' => 'payment_or_refund_notification', 'type' => 'subject'],
['name' => 'payment_or_refund_notification', 'type' => 'text'],
['name' => 'pcp_notify', 'type' => 'subject'],
['name' => 'pcp_owner_notify', 'type' => 'html'],
['name' => 'pcp_owner_notify', 'type' => 'subject'],
['name' => 'pcp_owner_notify', 'type' => 'text'],
['name' => 'pcp_status_change', 'type' => 'subject'],
['name' => 'pcp_supporter_notify', 'type' => 'html'],
['name' => 'pcp_supporter_notify', 'type' => 'subject'],
['name' => 'pcp_supporter_notify', 'type' => 'text'],
['name' => 'petition_confirmation_needed', 'type' => 'html'],
['name' => 'petition_confirmation_needed', 'type' => 'subject'],
['name' => 'petition_confirmation_needed', 'type' => 'text'],
['name' => 'petition_sign', 'type' => 'html'],
['name' => 'petition_sign', 'type' => 'subject'],
['name' => 'petition_sign', 'type' => 'text'],
['name' => 'pledge_acknowledge', 'type' => 'subject'],
['name' => 'pledge_acknowledge', 'type' => 'subject'],
['name' => 'pledge_reminder', 'type' => 'html'],
['name' => 'pledge_reminder', 'type' => 'subject'],
['name' => 'pledge_reminder', 'type' => 'text'],
['name' => 'uf_notify', 'type' => 'subject'],
],
],
];
}
......
tests/phpunit/CRM/Core/Payment/AuthorizeNetIPNTest.php
+ 4
− 4
View file @ c9496bc6
......@@ -255,7 +255,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase {
'Email Address: anthony_anderson@civicrm.org',
'Honor',
'This membership will be automatically renewed every',
'Dear Mr. Anthony Anderson II',
'Dear Anthony',
'Thanks for your auto renew membership sign-up',
'In Memory of',
]);
......@@ -281,7 +281,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase {
'Last Name: Anderson',
'Email Address: antonia_anderson@civicrm.org',
'This membership will be automatically renewed every',
'Dear Mrs. Antonia Anderson II',
'Dear Antonia',
'Thanks for your auto renew membership sign-up',
]);
......@@ -316,7 +316,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase {
'Last Name: Anderson',
'Email Address: anthony_anderson@civicrm.org',
'This membership will be automatically renewed every',
'Dear Mr. Anthony Anderson II',
'Dear Anthony',
'Thanks for your auto renew membership sign-up',
]);
......@@ -337,7 +337,7 @@ class CRM_Core_Payment_AuthorizeNetIPNTest extends CiviUnitTestCase {
'Membership Start Date:',
'Transaction #: hers',
'This membership will be automatically renewed every',
'Dear Mrs. Antonia Anderson II',
'Dear Antonia',
'Thanks for your auto renew membership sign-up',
],
[
......
xml/templates/message_templates/contribution_offline_receipt_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
{if $formValues.receipt_text}
<p>{$formValues.receipt_text|htmlize}</p>
{else}
......
xml/templates/message_templates/contribution_offline_receipt_text.tpl
+ 2
− 0
View file @ c9496bc6
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{if $formValues.receipt_text}
{$formValues.receipt_text}
{else}{ts}Thank you for your support.{/ts}{/if}
......
xml/templates/message_templates/contribution_recurring_billing_html.tpl
+ 2
− 2
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
<p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
<p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}</p>
</td>
</tr>
......@@ -62,4 +62,4 @@
</center>
</body>
</html>
\ No newline at end of file
</html>
xml/templates/message_templates/contribution_recurring_billing_text.tpl
+ 2
− 2
View file @ c9496bc6
{ts 1=$contact.display_name}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}
......@@ -20,4 +20,4 @@
{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
\ No newline at end of file
{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
xml/templates/message_templates/contribution_recurring_cancelled_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
<p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
<p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}</p>
</td>
</tr>
......
xml/templates/message_templates/contribution_recurring_cancelled_text.tpl
+ 1
− 1
View file @ c9496bc6
{ts 1=$contact.display_name}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}
xml/templates/message_templates/contribution_recurring_edit_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
<p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
<p>{ts}Your recurring contribution has been updated as requested:{/ts}
<p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.</p>
......
xml/templates/message_templates/contribution_recurring_edit_text.tpl
+ 2
− 2
View file @ c9496bc6
{ts 1=$contact.display_name}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{ts}Your recurring contribution has been updated as requested:{/ts}
{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}
{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}
{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
\ No newline at end of file
{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}
xml/templates/message_templates/contribution_recurring_notify_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
<p>{ts 1=$displayName}Dear %1{/ts},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
</td>
</tr>
......
xml/templates/message_templates/contribution_recurring_notify_text.tpl
+ 1
− 1
View file @ c9496bc6
{ts 1=$displayName}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{if $recur_txnType eq 'START'}
{if $auto_renew_membership}
......
xml/templates/message_templates/event_registration_receipt_html.tpl
+ 1
− 2
View file @ c9496bc6
......@@ -9,7 +9,7 @@
{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture}
{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
<p>Dear {contact.display_name},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
{if $is_pay_later}
<p>
This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.
......@@ -27,7 +27,6 @@
<p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}
Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}:</p>
{if $billing_name}
<table class="billing-info">
<tr>
......
xml/templates/message_templates/event_registration_receipt_text.tpl
+ 2
− 1
View file @ c9496bc6
Dear {contact.display_name},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{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}
......
xml/templates/message_templates/membership_autorenew_billing_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
<p>{ts 1=$contact.display_name}Dear %1{/ts},</p>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
<p>{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}</p>
</td>
</tr>
......
xml/templates/message_templates/membership_autorenew_billing_text.tpl
+ 2
− 2
View file @ c9496bc6
{ts 1=$contact.display_name}Dear %1{/ts},
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}
......@@ -20,4 +20,4 @@
{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
\ No newline at end of file
{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}
xml/templates/message_templates/membership_autorenew_cancelled_html.tpl
+ 1
− 1
View file @ c9496bc6
......@@ -21,7 +21,7 @@
<tr>
<td>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
<p>{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}</p>
</td>
......
xml/templates/message_templates/membership_autorenew_cancelled_text.tpl
+ 2
− 0
View file @ c9496bc6
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}
===========================================================
......
xml/templates/message_templates/membership_offline_receipt_html.tpl
+ 1
− 0
View file @ c9496bc6
......@@ -21,6 +21,7 @@
<tr>
<td>
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}<p>{$greeting},</p>{/if}
{if $formValues.receipt_text_signup}
<p>{$formValues.receipt_text_signup|htmlize}</p>
{elseif $formValues.receipt_text_renewal}
......
xml/templates/message_templates/membership_offline_receipt_text.tpl
+ 2
− 0
View file @ c9496bc6
{assign var="greeting" value="{contact.email_greeting}"}{if $greeting}{$greeting},{/if}
{if $formValues.receipt_text_signup}
{$formValues.receipt_text_signup}
{elseif $formValues.receipt_text_renewal}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment