projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b6e799)
Simplify logic for displaying card details for Confirm and Thank you page
authoreileen <emcnaughton@wikimedia.org>
Fri, 18 Oct 2019 01:45:03 +0000 (14:45 +1300)
committereileen <emcnaughton@wikimedia.org>
Fri, 18 Oct 2019 01:47:26 +0000 (14:47 +1300)
templates/CRM/Event/Form/Registration/Confirm.tpl patch | blob | blame | history
templates/CRM/Event/Form/Registration/ThankYou.tpl patch | blob | blame | history

diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
index 26398922f98187270d94951fd9ccb4eaa66b079c..876c1d747dc631ad98f155eda1e3928c6201fc5b 100644 (file)
--- 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 72d6aa06b28b1fa573fed943db8989de23004724..ace4920cb4f2f8eb85e68601dea886b7b188c542 100644 (file)
--- 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">