From a5002aee870b3d5e2660212ffdd240e245e76431 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Oct 2019 14:45:03 +1300
Subject: [PATCH] Simplify logic for displaying card details for Confirm and
 Thank you page

---
 templates/CRM/Event/Form/Registration/Confirm.tpl  | 2 +-
 templates/CRM/Event/Form/Registration/ThankYou.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
index 26398922f981..876c1d747dc6 100644
--- a/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -167,7 +167,7 @@
       </div>
     {/if}
 
-    {if $contributeMode eq 'direct' and ! $is_pay_later and !$isAmountzero and !$isOnWaitlist and !$isRequireApproval}
+    {if $credit_card_type}
       {crmRegion name="event-confirm-billing-block"}
         <div class="crm-group credit_card-group">
           <div class="header-dark">
diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl
index 72d6aa06b28b..ace4920cb4f2 100644
--- a/templates/CRM/Event/Form/Registration/ThankYou.tpl
+++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl
@@ -188,7 +188,7 @@
         </div>
     {/if}
 
-    {if $contributeMode eq 'direct' and $paidEvent and ! $is_pay_later and !$isAmountzero and !$isOnWaitlist and !$isRequireApproval}
+    {if $credit_card_type}
       {crmRegion name="event-thankyou-billing-block"}
         <div class="crm-group credit_card-group">
           <div class="header-dark">