From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 21 Nov 2023 00:13:15 +0000 (+1300)
Subject: Online membership receipt simplification
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a1930ca122178183d68c61c7bd0a30671316540b;p=civicrm-core.git

Online membership receipt simplification

Rather than having one section in an IF for the scenario where we have a separate payment situation
but there is no contribution payment, consolidate this scenario with the general 'we
have a membership but no contribution in the receipt
---

diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl
index bae92aa780..0381eca200 100644
--- a/xml/templates/message_templates/membership_online_receipt_html.tpl
+++ b/xml/templates/message_templates/membership_online_receipt_html.tpl
@@ -72,7 +72,7 @@
         <th {$headerStyle}>{ts}Membership Fee{/ts}</th>
       </tr>
 
-      {if !$useForMember and isset($membership_amount) and !empty($is_quick_config)}
+      {if !$isShowLineItems && {contribution.total_amount|boolean}}
         <tr>
           <td {$labelStyle}>
             {ts 1=$membership_name}%1 Membership{/ts}
@@ -177,20 +177,6 @@
             {contribution.total_amount} {if isset($amount_level)} - {$amount_level}{/if}
         </td>
       </tr>
-    {elseif isset($membership_amount)}
-      <tr>
-        <th {$headerStyle}>
-          {ts}Membership Fee{/ts}
-        </th>
-      </tr>
-      <tr>
-        <td {$labelStyle}>
-          {ts 1=$membership_name}%1 Membership{/ts}
-        </td>
-        <td {$valueStyle}>
-          {$membership_amount|crmMoney}
-        </td>
-      </tr>
     {/if}
 
     {if !empty($receive_date)}