CRM-16109 - suppress fee section for waitlist and approval-required registration...

----------------------------------------
* CRM-16109: Confusing empty display of fees section during confirmation and thank-you for waitlisted and require-approval registrations
  https://issues.civicrm.org/jira/browse/CRM-16109

diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
index b4facff57eb649f6622c1bd645a5e5d004761dd7..5e68da00ddd77c4bb4ff90a71e13d373b7f84243 100644 (file)
--- a/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -101,7 +101,7 @@
     </div>
     {/if}
 
-    {if $paidEvent}
+    {if $paidEvent && !$isRequireApproval && !$isOnWaitlist}
         <div class="crm-group event_fees-group">
             <div class="header-dark">
                 {$event.fee_label}

diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl
index 5f3640664df8564f84f9228723aad6d0c339d479..9ad95259bab1b7e13dbd0e2a0ba75acbb3eb6369 100644 (file)
--- a/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -93,7 +93,7 @@
         </div>
     </div>
 
-    {if $paidEvent}
+    {if $paidEvent && !$isRequireApproval && !$isOnWaitlist}
         <div class="crm-group event_fees-group">
             <div class="header-dark">
                 {$event.fee_label}