From 305c156a434c5edf9224b6f08a1358c5e7b8dc37 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 29 Oct 2019 09:26:51 +1300 Subject: [PATCH] dev/core#1344 Simplify email template logic on displaying billing detail Per https://lab.civicrm.org/dev/core/issues/1344 we currently use complex & fragile logic whereas we can simply display what we have gathered. Since email templates are already being upgraded this release it feels like a good opportunity to clean these up too. This just includes one template - but I'll rip through the rest if this gets merged & people agree --- xml/templates/message_templates/event_online_receipt_html.tpl | 2 +- xml/templates/message_templates/event_online_receipt_text.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index bdc8429932..3bd5adbff7 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -396,7 +396,7 @@ {/if} - {if $contributeMode ne 'notify' and !$isAmountzero and (!$is_pay_later or $isBillingAddressRequiredForPayLater) and !$isOnWaitlist and !$isRequireApproval} + {if $billingName} {ts}Billing Name and Address{/ts} diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index 610caf5c4f..dbd5f1ba88 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -199,7 +199,7 @@ You were registered by: {$payer.name} {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 $billingName} ==========================================================={if $pricesetFieldsCount }===================={/if} -- 2.25.1