Merge pull request #26431 from larssandergreen/Show-fee-info-above-pa…

…yment-info-on-Event-confirmation-and-thank-you Show Event Info at bottom of Registration Confirm & Fee Info above Payment
civicrm · Jun 4, 2023 · 5b0b752 · 5b0b752
2 parents 4271c09 + e6df64a
commit 5b0b752
Showing 1 changed file with 47 additions and 47 deletions.
diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -46,6 +46,44 @@
         </div>
     {/if}
 
+    {if $paidEvent && !$isRequireApproval && !$isOnWaitlist}
+        <div class="crm-group event_fees-group">
+            <div class="header-dark">
+                {$event.fee_label}
+            </div>
+            {if $lineItem}
+                {include file="CRM/Price/Page/LineItem.tpl" context="Event"}
+            {elseif $amounts || $amount == 0}
+          <div class="crm-section no-label amount-item-section">
+                    {foreach from= $amounts item=amount key=level}
+              <div class="content">
+                  {$amount.amount|crmMoney}&nbsp;&nbsp;{$amount.label}
+              </div>
+                  <div class="clear"></div>
+                    {/foreach}
+            </div>
+                {if $totalTaxAmount}
+                  <div class="crm-section no-label total-amount-section">
+                  <div class="content bold">{ts}Total {$taxTerm} Amount{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney}</div>
+                  <div class="clear"></div>
+                  </div>
+                {/if}
+                {if $totalAmount}
+                <div class="crm-section no-label total-amount-section">
+                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney}</div>
+                    <div class="clear"></div>
+                  </div>
+                {/if}
+                {if $hookDiscount.message}
+                    <div class="crm-section hookDiscount-section">
+                        <em>({$hookDiscount.message})</em>
+                    </div>
+                {/if}
+            {/if}
+
+        </div>
+    {/if}
+
     {if $showPaymentOnConfirm}
     <div class="crm-group event_info-group">
       <div class="header-dark">
@@ -66,15 +104,6 @@
     </div>
     {/if}
 
-    <div class="crm-group event_info-group">
-        <div class="header-dark">
-            {ts}Event Information{/ts}
-        </div>
-        <div class="display-block">
-            {include file="CRM/Event/Form/Registration/EventInfoBlock.tpl"}
-        </div>
-    </div>
-
     {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
         <div class="header-dark">
@@ -97,44 +126,6 @@
     </div>
     {/if}
 
-    {if $paidEvent && !$isRequireApproval && !$isOnWaitlist}
-        <div class="crm-group event_fees-group">
-            <div class="header-dark">
-                {$event.fee_label}
-            </div>
-            {if $lineItem}
-                {include file="CRM/Price/Page/LineItem.tpl" context="Event"}
-            {elseif $amounts || $amount == 0}
-          <div class="crm-section no-label amount-item-section">
-                    {foreach from= $amounts item=amount key=level}
-              <div class="content">
-                  {$amount.amount|crmMoney}&nbsp;&nbsp;{$amount.label}
-              </div>
-                  <div class="clear"></div>
-                    {/foreach}
-            </div>
-                {if $totalTaxAmount}
-                  <div class="crm-section no-label total-amount-section">
-                  <div class="content bold">{ts}Total {$taxTerm} Amount{/ts}:&nbsp;&nbsp;{$totalTaxAmount|crmMoney}</div>
-                  <div class="clear"></div>
-                  </div>
-                {/if}
-                {if $totalAmount}
-                <div class="crm-section no-label total-amount-section">
-                    <div class="content bold">{ts}Total Amount{/ts}:&nbsp;&nbsp;{$totalAmount|crmMoney}</div>
-                    <div class="clear"></div>
-                  </div>
-                {/if}
-                {if $hookDiscount.message}
-                    <div class="crm-section hookDiscount-section">
-                        <em>({$hookDiscount.message})</em>
-                    </div>
-                {/if}
-            {/if}
-
-        </div>
-    {/if}
-
     {if $event.participant_role neq 'Attendee' and $defaultRole}
         <div class="crm-group participant_role-group">
             <div class="header-dark">
@@ -183,6 +174,15 @@
       {/crmRegion}
     {/if}
 
+    <div class="crm-group event_info-group">
+        <div class="header-dark">
+            {ts}Event Information{/ts}
+        </div>
+        <div class="display-block">
+            {include file="CRM/Event/Form/Registration/EventInfoBlock.tpl"}
+        </div>
+    </div>
+
     {if $contributeMode NEQ 'notify'} {* In 'notify mode, contributor is taken to processor payment forms next *}
     <div class="messages status section continue_message-section">
         <p>