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

civicrm · Nov 1, 2019 · 66af4b3 · 66af4b3
1 parent e7cbb73
commit 66af4b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl
@@ -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}
 
@@ -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}
 
 ===========================================================

diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
@@ -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}
 
@@ -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}
 
 ===========================================================