From c6c66ed70bdb125304c395a9655505801145ec3b Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 1 Nov 2019 09:10:55 +1100
Subject: [PATCH] dev/core#1344 Fix complicated logic on credit card and
 billing name sections as agreed in #15651

---
 xml/templates/message_templates/event_offline_receipt_html.tpl  | 2 +-
 xml/templates/message_templates/event_offline_receipt_text.tpl  | 2 +-
 .../message_templates/membership_offline_receipt_html.tpl       | 2 +-
 .../message_templates/membership_offline_receipt_text.tpl       | 2 +-
 .../message_templates/membership_online_receipt_text.tpl        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl
index ad7de7ecb5..580419dace 100644
--- a/xml/templates/message_templates/event_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/event_offline_receipt_html.tpl
@@ -374,7 +374,7 @@
         </tr>
        {/if}
 
-       {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+       {if $billingName}
         <tr>
          <th {$headerStyle}>
           {ts}Billing Name and Address{/ts}
diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl
index a68fd845a6..c8578b09e6 100644
--- a/xml/templates/message_templates/event_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/event_offline_receipt_text.tpl
@@ -192,7 +192,7 @@
 {if $checkNumber}
 {ts}Check Number{/ts}: {$checkNumber}
 {/if}
-{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later and !$isOnWaitlist and !$isRequireApproval}
+{if $billingName}
 
 ==========================================================={if $pricesetFieldsCount }===================={/if}
 
diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 24cfcdc47e..3c34f9cdb9 100644
--- a/xml/templates/message_templates/membership_offline_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl
@@ -222,7 +222,7 @@
     <td>
      <table style="border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;">
 
-      {if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later }
+      {if $billingName}
        <tr>
         <th {$headerStyle}>
          {ts}Billing Name and Address{/ts}
diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl
index 7ed84e171a..802deb0238 100644
--- a/xml/templates/message_templates/membership_offline_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl
@@ -79,7 +79,7 @@
 {/if}
 
 {if $isPrimary }
-{if $contributeMode ne 'notify' and !$isAmountzero and !$is_pay_later  }
+{if $billingName}
 
 ===========================================================
 {ts}Billing Name and Address{/ts}
diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl
index f4d0177c3d..040e0efd7e 100644
--- a/xml/templates/message_templates/membership_online_receipt_text.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_text.tpl
@@ -172,7 +172,7 @@
 {$email}
 {/if} {* End ! is_pay_later condition. *}
 {/if}
-{if $contributeMode eq 'direct' AND !$is_pay_later AND ( $amount GT 0 OR $membership_amount GT 0 ) }
+{if $credit_card_type}
 
 ===========================================================
 {ts}Credit Card Information{/ts}
-- 
2.25.1