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 0ef11134d829b81277a9ea12a2b9b195548ef77c..80bdb64bb4cb74c3ad579a0f5f92cd59b5ce0b3b 100644 (file)
--- 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 779e17cd2f5a423268e74c5a178aeee60ff639e4..4f741779b855f50ef6677d95c0827c5a8fb2da0d 100644 (file)
--- 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}