From 057265f7c70e321632744c84b0866a0a4775b918 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 17 Nov 2023 13:19:21 +1300 Subject: [PATCH] Reformat whitespace in online membership receipt --- .../membership_online_receipt_html.tpl | 654 +++++++++--------- 1 file changed, 320 insertions(+), 334 deletions(-) diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index 5ce49faf0b..900a96362f 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -33,8 +33,7 @@ - - {if $membership_assign && !$useForMember} + {if $membership_assign && !$useForMember} {/if} - {/if} - - - {if $amount} + {/if} + {if $amount} - + {if !$useForMember and isset($membership_amount) and !empty($is_quick_config)} - - - - - - {if $amount && !$is_separate_payment} - + - - - + {if $amount && !$is_separate_payment} + + - - {/if} - + {$amount|crmMoney} + + + + + + + {/if} {elseif empty($useForMember) && !empty($lineItem) and $priceSetID and empty($is_quick_config)} - - {foreach from=$lineItem item=value key=priceset} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} - + + - {/foreach} - - - - {else} - {if $useForMember && $lineItem and empty($is_quick_config)} - {foreach from=$lineItem item=value key=priceset} - - - - {/foreach} - {if !empty($dataArray)} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset || $priceset == 0} - - - {else} - - + {/if} - - {/foreach} - {/if} - {/if} - {if $totalTaxAmount} - - - - {/if} - - - - - + + + {/if} - - {elseif isset($membership_amount)} - - + {elseif isset($membership_amount)} - + - - + + + {/if} - - {/if} - - {if !empty($receive_date)} + {if !empty($receive_date)} - - + + - {/if} + {/if} - {if !empty($is_monetary) and !empty($trxn_id)} + {if !empty($is_monetary) and !empty($trxn_id)} {/if} - {if !empty($membership_trx_id)} + {if !empty($membership_trx_id)} - {/if} - {if !empty($is_recur)} - + {/if} + {if !empty($is_recur)} + - - {if $updateSubscriptionBillingUrl} - + + {if $updateSubscriptionBillingUrl} + - - {/if} - {/if} + + {/if} + {/if} - {if $honor_block_is_active} + {if $honor_block_is_active} - + {foreach from=$honoreeProfile item=value key=label} - - + + {/foreach} - {/if} + {/if} - {if !empty($pcpBlock)} + {if !empty($pcpBlock)} - + - - - - {if $pcp_roll_nickname} - - + + {if $pcp_roll_nickname} + + + + {/if} {if $pcp_personal_note} - - - - + + + + {/if} - {/if} + {/if} - {if !empty($onBehalfProfile)} + {if !empty($onBehalfProfile)} - + {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName} - - + + {/foreach} - {/if} + {/if} - {if !empty($billingName)} - - + {if !empty($billingName)} + + {/if} - {if !empty($credit_card_type)} + {if !empty($credit_card_type)} - + - + - {/if} + {/if} - {if !empty($selectPremium)} + {if !empty($selectPremium)} - + - + {if $option} - - - - + + + + {/if} {if $sku} - - - - + + + + {/if} {if $start_date} - - - - + + + + {/if} {if $end_date} - - - - + + + + {/if} {if !empty($contact_email) OR !empty($contact_phone)} - - - + + + {/if} {if $is_deductible AND !empty($price)} - {/if} - {/if} + {/if} - {if !empty($customPre)} + {if !empty($customPre)} {foreach from=$customPre item=customValue key=customName} - - + + {/foreach} - {/if} + {/if} - {if !empty($customPost)} + {if !empty($customPost)} - + {foreach from=$customPost item=customValue key=customName} - - + + {/foreach} - {/if} + {/if}
{ts}Membership Information{/ts} @@ -68,219 +67,206 @@
- {ts}Membership Fee{/ts} - {ts}Membership Fee{/ts}
- {ts 1=$membership_name}%1 Membership{/ts} - - {$membership_amount|crmMoney} -
- {ts}Contribution Amount{/ts} + {ts 1=$membership_name}%1 Membership{/ts} - {$amount|crmMoney} + {$membership_amount|crmMoney}
- {ts}Total{/ts} +
+ {ts}Contribution Amount{/ts} - {$amount+$membership_amount|crmMoney} -
+ {ts}Total{/ts} + + {$amount+$membership_amount|crmMoney} +
+ + + + + + + + {foreach from=$value item=line} + + + + + + + {/foreach} +
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Total{/ts}
+ {$line.description|truncate:30:"..."} + + {$line.qty} + + {$line.unit_price|crmMoney} + + {$line.line_total|crmMoney} +
+
- - - - - - - - {foreach from=$value item=line} - - - - - - - {/foreach} -
{ts}Item{/ts}{ts}Qty{/ts}{ts}Each{/ts}{ts}Total{/ts}
- {$line.description|truncate:30:"..."} - - {$line.qty} - - {$line.unit_price|crmMoney} - - {$line.line_total|crmMoney} -
- 		+ {ts}Total Amount{/ts} + + {$amount|crmMoney} +
- {ts}Total Amount{/ts} - - {$amount|crmMoney} -
- - - - - {if !empty($dataArray)} - - - - - {/if} - - - - {foreach from=$value item=line} + {if $useForMember && $lineItem and empty($is_quick_config)} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {if !empty($dataArray)} - - - {if !empty($dataArray)} - - {if ($line.tax_rate || $line.tax_amount != "")} - - - {else} - - - {/if} - + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset || $priceset == 0} + + + {else} + + {/if} - + {/foreach} + {/if} + {/if} + {if $totalTaxAmount} + + - - - {/foreach} -
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts}
+ + + + + {if !empty($dataArray)} + + + + + {/if} + + + + {foreach from=$value item=line} + + + + {if !empty($dataArray)} + + {if ($line.tax_rate || $line.tax_amount != "")} + + + {else} + + + {/if} + + {/if} + + + + {/foreach} +
{ts}Item{/ts}{ts}Fee{/ts}{ts}SubTotal{/ts}{ts}Tax Rate{/ts}{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Membership Start Date{/ts}{ts}Membership Expiration Date{/ts}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {$line.line_total|crmMoney} + + {$line.unit_price*$line.qty|crmMoney} + + {$line.tax_rate|string_format:"%.2f"}% + + {$line.tax_amount|crmMoney} + + {$line.line_total+$line.tax_amount|crmMoney} + + {$line.start_date} + + {$line.end_date} +
+
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + 		+ {ts}Amount Before Tax:{/ts} - {$line.line_total|crmMoney} + + {contribution.tax_exclusive_amount} - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% - - {$line.tax_amount|crmMoney} - - {$line.line_total+$line.tax_amount|crmMoney} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}NO{/ts} {$taxTerm} {$value|crmMoney:$currency} - {$line.start_date} +
+ {ts}Total Tax Amount{/ts} - {$line.end_date} + + {$totalTaxAmount|crmMoney:$currency}
-
- {ts}Amount Before Tax:{/ts} - - {contribution.tax_exclusive_amount} -
 {$taxTerm} {$priceset|string_format:"%.2f"}% {$value|crmMoney:$currency} {ts}NO{/ts} {$taxTerm} {$value|crmMoney:$currency}
- {ts}Total Tax Amount{/ts} - - {$totalTaxAmount|crmMoney:$currency} -
- {ts}Amount{/ts} - - {$amount|crmMoney} {if isset($amount_level)} - {$amount_level}{/if} -
+ {ts}Amount{/ts} + + {$amount|crmMoney} {if isset($amount_level)} - {$amount_level}{/if} +
- {ts}Membership Fee{/ts} - + {ts}Membership Fee{/ts} +
- {ts 1=$membership_name}%1 Membership{/ts} - - {$membership_amount|crmMoney} - + {ts 1=$membership_name}%1 Membership{/ts} + + {$membership_amount|crmMoney} +
- {ts}Date{/ts} - - {$receive_date|crmDate} - + {ts}Date{/ts} + + {$receive_date|crmDate} +
{ts}Transaction #{/ts} @@ -291,111 +277,111 @@
- {ts}Membership Transaction #{/ts} + {ts}Membership Transaction #{/ts} - {$membership_trx_id} + {$membership_trx_id}
- {ts}This membership will be renewed automatically.{/ts} - {if $cancelSubscriptionUrl} - {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page.{/ts} - {/if} + {ts}This membership will be renewed automatically.{/ts} + {if $cancelSubscriptionUrl} + {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page.{/ts} + {/if}
- {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} + {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts}
- {$soft_credit_type} - + {$soft_credit_type} +
- {$label} - - {$value} - + {$label} + + {$value} +
- {ts}Personal Campaign Page{/ts} - + {ts}Personal Campaign Page{/ts} +
- {ts}Display In Honor Roll{/ts} - - {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if} -
- {ts}Nickname{/ts} + {ts}Display In Honor Roll{/ts} - {$pcp_roll_nickname} + {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}
+ {ts}Nickname{/ts} + + {$pcp_roll_nickname} +
- {ts}Personal Note{/ts} - - {$pcp_personal_note} -
+ {ts}Personal Note{/ts} + + {$pcp_personal_note} +
- {$onBehalfProfile_grouptitle} - + {$onBehalfProfile_grouptitle} +
- {$onBehalfName} - - {$onBehalfValue} - + {$onBehalfName} + + {$onBehalfValue} +
- {ts}Billing Name and Address{/ts} -
+ {ts}Billing Name and Address{/ts} +
@@ -417,129 +403,129 @@
- {ts}Credit Card Information{/ts} - + {ts}Credit Card Information{/ts} +
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
- 		+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:''|crmDate}
+
- {ts}Premium Information{/ts} - + {ts}Premium Information{/ts} +
- {$product_name} - + {$product_name} +
- {ts}Option{/ts} - - {$option} -
+ {ts}Option{/ts} + + {$option} +
- {ts}SKU{/ts} - - {$sku} -
+ {ts}SKU{/ts} + + {$sku} +
- {ts}Start Date{/ts} - - {$start_date|crmDate} -
+ {ts}Start Date{/ts} + + {$start_date|crmDate} +
- {ts}End Date{/ts} - - {$end_date|crmDate} -
+ {ts}End Date{/ts} + + {$end_date|crmDate} +
-

{ts}For information about this premium, contact:{/ts}

- {if !empty($contact_email)} -

{$contact_email}

- {/if} - {if !empty($contact_phone)} -

{$contact_phone}

- {/if} -
+

{ts}For information about this premium, contact:{/ts}

+ {if !empty($contact_email)} +

{$contact_email}

+ {/if} + {if !empty($contact_phone)} +

{$contact_phone}

+ {/if} +
-

{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}

+ 		+

{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}
- {$customPre_grouptitle} + {$customPre_grouptitle}
- {$customName} - - {$customValue} - + {$customName} + + {$customValue} +
- {$customPost_grouptitle} - + {$customPost_grouptitle} +
- {$customName} - - {$customValue} - + {$customName} + + {$customValue} +
-- 2.25.1