From 149fb2910c23dd0cf273512593656a40ce21de67 Mon Sep 17 00:00:00 2001 From: Pratik Joshi Date: Mon, 24 Jun 2013 19:28:15 +0530 Subject: [PATCH] CRM-12594 : fix for point 11, 12. fixed in 4.4 as per CRM-12594 comment-51378 --- .../contribution_dupalert_html.tpl | 89 +++++++++++++++++++ .../contribution_dupalert_text.tpl | 20 +++++ .../CRM/Contact/Form/Task/PDFLetterCommon.tpl | 2 +- .../contribution_dupalert_html.tpl | 2 +- .../contribution_dupalert_text.tpl | 2 +- 5 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl create mode 100644 CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl new file mode 100644 index 0000000000..774863dced --- /dev/null +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_html.tpl @@ -0,0 +1,89 @@ + + + + + + + + +{capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} +{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + + + + + + + + + + + + + + + + + + + + {if $receiptMessage} + + + + {/if} +

{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}

{ts}The information provided matched multiple existing database records based on the configured +Duplicate Matching Rules for your site.{/ts}

+ + + + + + + + + + + + + +

+ {ts}Organization Name{/ts} +	+ {$onBehalfName} +
+ {ts}Organization Email{/ts} +	+ {$onBehalfEmail} +
+ {ts}Organization Contact Id{/ts} +	+ {$onBehalfID} +

{ts}If you think this may be a duplicate contact which should be merged with an existing record - +Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict +rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}

+ + + + + + + +

+ {ts}Copy of Contribution Receipt{/ts} +
+ {* FIXME: the below is most probably not HTML-ised *} + {$receiptMessage} +

+ + + + diff --git a/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl new file mode 100644 index 0000000000..f178480907 --- /dev/null +++ b/CRM/Upgrade/4.4.alpha1.msg_template/message_templates/contribution_dupalert_text.tpl @@ -0,0 +1,20 @@ +{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts} +{ts}The information provided matched multiple existing database records based on the configured +Duplicate Matching Rules for your site.{/ts} + +{ts}Organization Name{/ts}: {$onBehalfName} +{ts}Organization Email{/ts}: {$onBehalfEmail} +{ts}Organization Contact Id{/ts}: {$onBehalfID} + +{ts}If you think this may be a duplicate contact which should be merged with an existing record - +Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict +rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts} + +{if $receiptMessage} +########################################################### +{ts}Copy of Contribution Receipt{/ts} + +########################################################### +{$receiptMessage} + +{/if} diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl index da7e5a51bd..f63e1767aa 100644 --- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl +++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl @@ -98,7 +98,7 @@

{if $editor EQ 'textarea'} -

{ts}NOTE: If you are composing HTML-formatted messages, you may want to enable a Rich Text (WYSIWYG) editor (Administer » Configure » Global Settings » Site Preferences).{/ts}

{ts}NOTE: If you are composing HTML-formatted messages, you may want to enable a Rich Text (WYSIWYG) editor (Administer » Customize Data & Screens » Display Preferences).{/ts}

{/if} {$form.html_message.html}

diff --git a/xml/templates/message_templates/contribution_dupalert_html.tpl b/xml/templates/message_templates/contribution_dupalert_html.tpl index f94304adf9..774863dced 100644 --- a/xml/templates/message_templates/contribution_dupalert_html.tpl +++ b/xml/templates/message_templates/contribution_dupalert_html.tpl @@ -59,7 +59,7 @@ Duplicate Matching Rules for your site.{/ts}

{ts}If you think this may be a duplicate contact which should be merged with an existing record - -Go to "CiviCRM >> Administer CiviCRM >> Find and Merge Duplicate Contacts". Use the strict +Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}

diff --git a/xml/templates/message_templates/contribution_dupalert_text.tpl b/xml/templates/message_templates/contribution_dupalert_text.tpl index 16cb47dfe8..f178480907 100644 --- a/xml/templates/message_templates/contribution_dupalert_text.tpl +++ b/xml/templates/message_templates/contribution_dupalert_text.tpl @@ -7,7 +7,7 @@ Duplicate Matching Rules for your site.{/ts} {ts}Organization Contact Id{/ts}: {$onBehalfID} {ts}If you think this may be a duplicate contact which should be merged with an existing record - -Go to "CiviCRM >> Administer CiviCRM >> Find and Merge Duplicate Contacts". Use the strict +Go to "Contacts >> Find and Merge Duplicate Contacts". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts} {if $receiptMessage} -- 2.25.1