From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 21 Sep 2023 19:03:12 +0000 (+1200)
Subject: Fix a couple more places to use tokens
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f06affa122e01bf8bfac02fd6b2e2b9c3b66b294;p=civicrm-core.git

Fix a couple more places to use tokens

I could make no sense of the whole default role ID thing

I removed it
---

diff --git a/tests/templates/message_templates/event_online_receipt_text.tpl b/tests/templates/message_templates/event_online_receipt_text.tpl
index 0ef11134d8..80bdb64bb4 100644
--- a/tests/templates/message_templates/event_online_receipt_text.tpl
+++ b/tests/templates/message_templates/event_online_receipt_text.tpl
@@ -31,7 +31,7 @@ event.event_start_date:::{$event.event_start_date|crmDate:"%A"}
 event.event_end_date:::{event.end_date|crmDate:"%Y%m%d"}
 event.is_monetary:::{event.is_monetary|boolean}
 event.fee_label:::{event.fee_label}
-event.participant_role::{event.participant_role_id:label}
+event.participant_role:::{event.participant_role_id:label}
 {if !empty($isShowLocation)}
 isShowLocation:::{$isShowLocation}
 location.address.1.display:::{$location.address.1.display}
diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl
index 779e17cd2f..4f741779b8 100644
--- a/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -279,14 +279,12 @@
                   <td {$valueStyle}>{$taxDetail.amount|crmMoney:'{contribution.currency}'}</td>
                 </tr>
               {/foreach}
-            {/if}
-            {if $isShowTax && {contribution.tax_amount|boolean}}
               <tr>
                 <td {$labelStyle}>
-                  {ts}Total Tax Amount{/ts}
+                    {ts}Total Tax Amount{/ts}
                 </td>
                 <td {$valueStyle}>
-                  {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}
+                    {if $isPrimary}{contribution.tax_amount}{else}{$participant.totals.tax_amount|crmMoney}{/if}
                 </td>
               </tr>
             {/if}