From d33fedb9a5b4339f5a2a2ad98e602414f05b7c25 Mon Sep 17 00:00:00 2001 From: Alice Frumin Date: Wed, 6 Sep 2023 13:01:49 -0400 Subject: [PATCH] update confirm too --- .../Contribute/Form/Contribution/Confirm.tpl | 85 +++++++++---------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 7675fb3e67..d0de9b5044 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -28,52 +28,49 @@ {if $amount GTE 0 OR $minimum_fee GTE 0 OR ( $isDisplayLineItems and $lineItem ) }
- {if !$useForMember} -
- {if !$membershipBlock AND $amount OR ( $isDisplayLineItems and $lineItem ) }{ts}Contribution Amount{/ts}{else}{ts}Membership Fee{/ts} {/if} -
- {/if} +
+ {if !$membershipBlock AND $amount OR ( $isDisplayLineItems and $lineItem ) }{ts}Contribution Amount{/ts}{else}{ts}Membership Fee{/ts} {/if} +
+
- {if !$useForMember} - {if $lineItem and $isDisplayLineItems} - {if !$amount}{assign var="amount" value=0}{/if} - {assign var="totalAmount" value=$amount} - {include file="CRM/Price/Page/LineItem.tpl" context="Contribution"} - {elseif $is_separate_payment } - {if $amount AND $minimum_fee} - {$membership_name} {ts}Membership{/ts}: - {$minimum_fee|crmMoney} -
- {ts}Additional Contribution{/ts}: - {$amount|crmMoney} -
- ------------------------------------------- -
- {ts}Total{/ts}: - {$amount+$minimum_fee|crmMoney} -
- {elseif $amount } - {ts}Amount{/ts}: - {$amount|crmMoney} {if $amount_level } - – {$amount_level}{/if} - {else} - {$membership_name} {ts}Membership{/ts}: - {$minimum_fee|crmMoney} - {/if} + {if $lineItem and $isDisplayLineItems} + {if !$amount}{assign var="amount" value=0}{/if} + {assign var="totalAmount" value=$amount} + {include file="CRM/Price/Page/LineItem.tpl" context="Contribution"} + {elseif $is_separate_payment } + {if $amount AND $minimum_fee} + {$membership_name} {ts}Membership{/ts}: + {$minimum_fee|crmMoney} +
+ {ts}Additional Contribution{/ts}: + {$amount|crmMoney} +
+ ------------------------------------------- +
+ {ts}Total{/ts}: + {$amount+$minimum_fee|crmMoney} +
+ {elseif $amount } + {ts}Amount{/ts}: + {$amount|crmMoney} {if $amount_level } + – {$amount_level}{/if} {else} - {if $totalTaxAmount } - {ts 1=$taxTerm}Total %1 Amount{/ts}: - {$totalTaxAmount|crmMoney} -
- {/if} - {if $amount} - {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if}: - {$amount|crmMoney:$currency}{if $amount_level } - – {$amount_level}{/if} - {else} - {$membership_name} {ts}Membership{/ts}: - {$minimum_fee|crmMoney} - {/if} + {$membership_name} {ts}Membership{/ts}: + {$minimum_fee|crmMoney} + {/if} + {else} + {if $totalTaxAmount } + {ts 1=$taxTerm}Total %1 Amount{/ts}: + {$totalTaxAmount|crmMoney} +
+ {/if} + {if $amount} + {if $installments}{ts}Installment Amount{/ts}{else}{ts}Total Amount{/ts}{/if}: + {$amount|crmMoney:$currency}{if $amount_level } + – {$amount_level}{/if} + {else} + {$membership_name} {ts}Membership{/ts}: + {$minimum_fee|crmMoney} {/if} {/if} -- 2.25.1