From a4c536bc8dff227f1e771fa0b49e372bcccb71b1 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 21 Jun 2023 20:09:49 -0700 Subject: [PATCH] Fix e-notices in contribution_offline_receipt text by removing always-empty field On looking to fix this enotice through the form it turned out the contribution form does not have a field for this - so the formValues will never hold receipt_text. Hence this PR removes it from the template. Other forms do seem to have this & I will separately add userText or similar to the model --- .../message_templates/contribution_offline_receipt_html.tpl | 4 ---- .../message_templates/contribution_offline_receipt_text.tpl | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index f401782dc1..2a220b5fa3 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -21,11 +21,7 @@ {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}

{$greeting},

{/if} - {if !empty($formValues.receipt_text)} -

{$formValues.receipt_text|htmlize}

- {else}

{ts}Below you will find a receipt for this contribution.{/ts}

- {/if} diff --git a/xml/templates/message_templates/contribution_offline_receipt_text.tpl b/xml/templates/message_templates/contribution_offline_receipt_text.tpl index e5692d0642..1f6ea39deb 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_text.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_text.tpl @@ -1,8 +1,6 @@ {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}{$greeting},{/if} -{if !empty($formValues.receipt_text)} -{$formValues.receipt_text} -{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if} +{ts}Below you will find a receipt for this contribution.{/ts} =========================================================== {ts}Contribution Information{/ts} -- 2.25.1