Add billingblock region to event registration confirm to match contri…

…bution confirm
civicrm · Mar 4, 2019 · 2b2d4ea · 2b2d4ea
1 parent 757b1e1
commit 2b2d4ea
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 35 deletions.
diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -220,42 +220,42 @@
 
     {* Show credit or debit card section for 'direct' mode, except for PayPal Express (detected because credit card number is empty) *}
     {if $contributeMode eq 'direct' and ! $is_pay_later and $is_monetary and ( $amount GT 0 OR $minimum_fee GT 0 )}
-{crmRegion name="contribution-confirm-billing-block"}
-       {if ($credit_card_number or $bank_account_number)}
+      {crmRegion name="contribution-confirm-billing-block"}
+      {if ($credit_card_number or $bank_account_number)}
         <div class="crm-group credit_card-group">
-            {if $paymentFieldsetLabel}
-              <div class="header-dark">
-                {$paymentFieldsetLabel}
-              </div>
-            {/if}
-            {if $paymentProcessor.payment_type == 2}
-                <div class="display-block">
-                    {ts}Account Holder{/ts}: {$account_holder}<br />
-                    {ts}Bank Account Number{/ts}: {$bank_account_number}<br />
-                    {ts}Bank Identification Number{/ts}: {$bank_identification_number}<br />
-                    {ts}Bank Name{/ts}: {$bank_name}<br />
+          {if $paymentFieldsetLabel}
+            <div class="header-dark">
+              {$paymentFieldsetLabel}
+            </div>
+          {/if}
+          {if $paymentProcessor.payment_type == 2}
+            <div class="display-block">
+              {ts}Account Holder{/ts}: {$account_holder}<br />
+              {ts}Bank Account Number{/ts}: {$bank_account_number}<br />
+              {ts}Bank Identification Number{/ts}: {$bank_identification_number}<br />
+              {ts}Bank Name{/ts}: {$bank_name}<br />
+            </div>
+            {if $contributeMode eq 'direct'}
+              <div class="crm-group debit_agreement-group">
+                <div class="header-dark">
+                  {ts}Agreement{/ts}
                 </div>
-                {if $contributeMode eq 'direct'}
-                  <div class="crm-group debit_agreement-group">
-                      <div class="header-dark">
-                          {ts}Agreement{/ts}
-                      </div>
-                      <div class="display-block">
-                          {ts}Your account data will be used to charge your bank account via direct debit. While submitting this form you agree to the charging of your bank account via direct debit.{/ts}
-                      </div>
-                  </div>
-                {/if}
-            {else}
-                <div class="crm-section no-label credit_card_details-section">
-                  <div class="content">{$credit_card_type|escape}</div>
-                  <div class="content">{$credit_card_number|escape}</div>
-                  <div class="content">{if $credit_card_exp_date}{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}{/if}</div>
-                  <div class="clear"></div>
+                <div class="display-block">
+                  {ts}Your account data will be used to charge your bank account via direct debit. While submitting this form you agree to the charging of your bank account via direct debit.{/ts}
                 </div>
+              </div>
             {/if}
+          {else}
+            <div class="crm-section no-label credit_card_details-section">
+              <div class="content">{$credit_card_type|escape}</div>
+              <div class="content">{$credit_card_number|escape}</div>
+              <div class="content">{if $credit_card_exp_date}{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}{/if}</div>
+              <div class="clear"></div>
+            </div>
+          {/if}
         </div>
       {/if}
-{/crmRegion}
+      {/crmRegion}
     {/if}
 
     {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="confirmContribution"}

diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -172,17 +172,19 @@
     {/if}
 
     {if $contributeMode eq 'direct' and ! $is_pay_later and !$isAmountzero and !$isOnWaitlist and !$isRequireApproval}
+      {crmRegion name="contribution-confirm-billing-block"}
         <div class="crm-group credit_card-group">
-            <div class="header-dark">
-                {ts}Credit Card Information{/ts}
-            </div>
-            <div class="crm-section no-label credit_card_details-section">
-                <div class="content">{$credit_card_type}</div>
+          <div class="header-dark">
+            {ts}Credit Card Information{/ts}
+          </div>
+          <div class="crm-section no-label credit_card_details-section">
+            <div class="content">{$credit_card_type}</div>
             <div class="content">{$credit_card_number}</div>
             <div class="content">{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}</div>
             <div class="clear"></div>
           </div>
         </div>
+      {/crmRegion}
     {/if}
 
     {if $contributeMode NEQ 'notify'} {* In 'notify mode, contributor is taken to processor payment forms next *}