From 4e0e5c1b2e35119dbbba24cfcf9958d748414c98 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Fri, 18 May 2018 17:01:12 +0100
Subject: [PATCH] Enhancements to Event Online Receipt message for
 registrations requiring approval:

1) Set subject to 'Registration Request Confirmation' for the initial confirmation.
Subject for the final confirmation is unchanged.

2) In the Registration Request Confirmation, fees have not been selected so remove
the Fees section that misleadingly shows Total Cost as 0.
---
 xml/templates/message_templates/event_online_receipt_html.tpl   | 2 +-
 .../message_templates/event_online_receipt_subject.tpl          | 2 +-
 xml/templates/message_templates/event_online_receipt_text.tpl   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl
index f7ebf3663e..187316fc5b 100644
--- a/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -177,7 +177,7 @@
        </td>
      </tr>
     {/if}
-    {if $event.is_monetary}
+    {if $event.is_monetary and not $isRequireApproval}
 
       <tr>
        <th {$headerStyle}>
diff --git a/xml/templates/message_templates/event_online_receipt_subject.tpl b/xml/templates/message_templates/event_online_receipt_subject.tpl
index c847397dbb..709fb37aad 100644
--- a/xml/templates/message_templates/event_online_receipt_subject.tpl
+++ b/xml/templates/message_templates/event_online_receipt_subject.tpl
@@ -1 +1 @@
-{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title}
\ No newline at end of file
+{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title}
diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl
index b0233b41ea..ea6b96827c 100644
--- a/xml/templates/message_templates/event_online_receipt_text.tpl
+++ b/xml/templates/message_templates/event_online_receipt_text.tpl
@@ -101,7 +101,7 @@
 {if $payer.name}
 You were registered by: {$payer.name}
 {/if}
-{if $event.is_monetary} {* This section for Paid events only.*}
+{if $event.is_monetary and not $isRequireApproval} {* This section for Paid events only.*}
 
 ==========================================================={if $pricesetFieldsCount }===================={/if}
 
-- 
2.25.1