Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#1344 Re-work if statements and remove excess ifs #15682

Merged
merged 1 commit into from
Nov 1, 2019
Merged

dev/core#1344 Re-work if statements and remove excess ifs #15682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions xml/templates/message_templates/contribution_online_receipt_text.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,7 @@
{/foreach}
{/if}

{if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary}
{if $is_pay_later && !$isBillingAddressRequiredForPayLater}
===========================================================
{ts}Registered Email{/ts}

===========================================================
{$email}
{elseif $amount GT 0}
{if $billingName}
===========================================================
{ts}Billing Name and Address{/ts}

Expand All @@ -142,8 +135,13 @@
{$address}

{$email}
{/if} {* End ! is_pay_later condition. *}
{/if}
{elseif $email}
===========================================================
{ts}Registered Email{/ts}

===========================================================
{$email}
{/if} {* End billingName or Email*}
{if $credit_card_type}

===========================================================
Expand Down
18 changes: 8 additions & 10 deletions xml/templates/message_templates/membership_online_receipt_text.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,7 @@
{/foreach}
{/if}

{if !( $contributeMode eq 'notify' OR $contributeMode eq 'directIPN' ) and $is_monetary}
{if $is_pay_later}
===========================================================
{ts}Registered Email{/ts}

===========================================================
{$email}
{elseif $amount GT 0 OR $membership_amount GT 0 }
{if $billingName}
===========================================================
{ts}Billing Name and Address{/ts}

Expand All @@ -170,8 +163,13 @@
{$address}

{$email}
{/if} {* End ! is_pay_later condition. *}
{/if}
{elseif $email}
===========================================================
{ts}Registered Email{/ts}

===========================================================
{$email}
{/if} {* End billingName or email *}
{if $credit_card_type}

===========================================================
Expand Down