From d4bb54f6dadca27e817c28bb96a6b1b80ffe3765 Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 18 Jan 2021 12:43:51 +1300 Subject: [PATCH] [NFC] Whitespace fix up --- .../membership_offline_receipt_html.tpl | 523 +++++++++--------- 1 file changed, 263 insertions(+), 260 deletions(-) diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 6d1edc1761..3cc8fe6f4c 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -1,8 +1,9 @@ - + - - + + @@ -11,283 +12,285 @@ {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
- +
- - - + + + - + - - - - - - +
- {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}

{$greeting},

{/if} - {if $formValues.receipt_text_signup} -

{$formValues.receipt_text_signup|htmlize}

- {elseif $formValues.receipt_text_renewal} -

{$formValues.receipt_text_renewal|htmlize}

- {else} -

{ts}Thank you for this contribution.{/ts}

- {/if} -
- - {if !$lineItem} - - - - - - + - - {/if} - {if ! $cancelled} - {if !$lineItem} - - - - - - - - - {/if} - {if $formValues.total_amount OR $formValues.total_amount eq 0 } - - - - {if $formValues.contributionType_name} - - - - - {/if} - - {if $lineItem} - {foreach from=$lineItem item=value key=priceset} - - - - {/foreach} - {if $dataArray} - - - - - {foreach from=$dataArray item=value key=priceset} - - {if $priceset} - - - {elseif $priceset == 0} - - - {/if} - - {/foreach} - {/if} - {/if} - {if isset($totalTaxAmount)} - - - - - {/if} - - - - - {if $receive_date} - - - - - {/if} - {if $formValues.paidBy} - - - - - {if $formValues.check_number} - - - - - {/if} - {/if} - {/if} - {/if} -
- {ts}Membership Information{/ts} -
- {ts}Membership Type{/ts} - - {$membership_name} +
+ {assign var="greeting" value="{contact.email_greeting}"}{if $greeting}

{$greeting},

{/if} + {if $formValues.receipt_text_signup} +

{$formValues.receipt_text_signup|htmlize}

+ {elseif $formValues.receipt_text_renewal} +

{$formValues.receipt_text_renewal|htmlize}

+ {else} +

{ts}Thank you for this contribution.{/ts}

+ {/if}
- {ts}Membership Start Date{/ts} - - {$mem_start_date} -
- {ts}Membership End Date{/ts} - - {$mem_end_date} -
- {ts}Membership Fee{/ts} -
- {ts}Financial Type{/ts} - - {$formValues.contributionType_name} -
- {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + + + {if $isPrimary} + - - {/foreach} -
+ + {if !$lineItem} - - - {if $dataArray} - - - - - {/if} - - + - {foreach from=$value item=line} - - + - - {if $dataArray} - - {if $line.tax_rate != "" || $line.tax_amount != ""} - + {/if} + {if ! $cancelled} + {if !$lineItem} + + - - {else} - - - {/if} - + + + + + + {/if} + {if $formValues.total_amount OR $formValues.total_amount eq 0 } + + + + {if $formValues.contributionType_name} + + + + {/if} - + + {if $lineItem} + {foreach from=$lineItem item=value key=priceset} + + + + {/foreach} + {if $dataArray} + + + + + {foreach from=$dataArray item=value key=priceset} + + {if $priceset} + + + {elseif $priceset == 0} + + + {/if} + + {/foreach} + {/if} + {/if} + {if isset($totalTaxAmount)} + + + + + {/if} + + + + + {if $receive_date} + + + + + {/if} + {if $formValues.paidBy} + + + + + {if $formValues.check_number} + + + + + {/if} + {/if} + {/if} + {/if} +
{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 End Date{/ts} + {ts}Membership Information{/ts} +
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} +
+ {ts}Membership Type{/ts} - {$line.line_total|crmMoney} + + {$membership_name} - {$line.unit_price*$line.qty|crmMoney} - - {$line.tax_rate|string_format:"%.2f"}% +
+ {ts}Membership Start Date{/ts} - {$line.tax_amount|crmMoney} + + {$mem_start_date} - {$line.line_total+$line.tax_amount|crmMoney} -
+ {ts}Membership End Date{/ts} + + {$mem_end_date} +
+ {ts}Membership Fee{/ts} +
+ {ts}Financial Type{/ts} + + {$formValues.contributionType_name} +
- {$line.start_date} -
+ {* FIXME: style this table so that it looks like the text version (justification, etc.) *} + + + + {if $dataArray} + + + + + {/if} + + + + {foreach from=$value item=line} + + + + {if $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 End 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} +
+
+ {ts}Amount Before Tax:{/ts} + + {$formValues.total_amount-$totalTaxAmount|crmMoney} +
 {$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} + + {$formValues.total_amount|crmMoney} +
+ {ts}Date Received{/ts} + + {$receive_date|truncate:10:''|crmDate} +
+ {ts}Paid By{/ts} + + {$formValues.paidBy} +
+ {ts}Check Number{/ts} + + {$formValues.check_number} +
+
- {$line.end_date} -
-
- {ts}Amount Before Tax:{/ts} - - {$formValues.total_amount-$totalTaxAmount|crmMoney} -
 {$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} - - {$formValues.total_amount|crmMoney} -
- {ts}Date Received{/ts} - - {$receive_date|truncate:10:''|crmDate} -
- {ts}Paid By{/ts} - - {$formValues.paidBy} -
- {ts}Check Number{/ts} - - {$formValues.check_number} -
-
- {if $isPrimary} - - - - - - - - {/if} - -
- + {if $billingName} + + + + + + + {/if} - {if $billingName} - - - - - - - {/if} + {if $credit_card_type} + + + + + + + + + + + {/if} - {if $credit_card_type} - - - - -
+ {ts}Billing Name and Address{/ts} +
+ {$billingName}
+ {$address} +
- {ts}Billing Name and Address{/ts} -
- {$billingName}
- {$address} -
+ {ts}Credit Card Information{/ts} +
+ {$credit_card_type}
+ {$credit_card_number} +
+ {ts}Expires{/ts} + + {$credit_card_exp_date|truncate:7:''|crmDate} +
- {ts}Credit Card Information{/ts} -
- {$credit_card_type}
- {$credit_card_number} +
- {ts}Expires{/ts} - - {$credit_card_exp_date|truncate:7:''|crmDate} -
- - - {/if} + + {/if} - {if $customValues} - - - + {if $customValues} - - - {foreach from=$customValues item=value key=customName} - - - - - {/foreach} -
- {ts}Membership Options{/ts} -
- {$customName} - - {$value} + + + + + + {foreach from=$customValues item=value key=customName} + + + + + {/foreach} +
+ {ts}Membership Options{/ts} +
+ {$customName} + + {$value} +
- - - {/if} + + {/if} - +
-- 2.25.1