From 31e43069c878282a0e94df1deb9776162f2c4379 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 2 Aug 2022 17:13:10 +1200
Subject: [PATCH] Switch line items in invoice template to previewable

---
 .../contribution_invoice_receipt_html.tpl     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index 5e6ddd2920..81dec36c23 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -68,26 +68,22 @@
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{domain.tax_term}</font></th>
         <th style="text-align:right;font-weight:bold;white-space: nowrap"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
       </tr>
-      {foreach from=$lineItem item=value key=priceset name=taxpricevalue}
+      {foreach from=$lineItems item=line}
         <tr>
           <td style="text-align:left;nowrap"><font size="1">
-            {if $value.html_type eq 'Text'}
-              {$value.label}
-            {else}
-              {$value.field_title} - {$value.label}
-            {/if}
-            {if $value.description}
-              <div>{$value.description|truncate:30:"..."}</div>
+            {$line.title}
+            {if $line.description}
+              <div>{$line.description|truncate:30:"..."}</div>
             {/if}
           </font></td>
-          <td style="text-align:right;"><font size="1">{$value.qty}</font></td>
-          <td style="text-align:right;"><font size="1">{$value.unit_price|crmMoney:$currency}</font></td>
-          {if $value.tax_amount != ''}
-            <td style="text-align:right;"><font size="1">{if $value.tax_rate}{$value.tax_rate}%{/if}</font></td>
-          {else}
-            <td style="text-align:right;"><font size="1">{if $taxTerm}{ts 1=$taxTerm}-{/ts}{/if}</font></td>
-          {/if}
-          <td style="text-align:right;"><font size="1">{$value.subTotal|crmMoney:$currency}</font></td>
+          <td style="text-align:right;"><font size="1">{$line.qty}</font></td>
+          <td style="text-align:right;"><font size="1">{$line.unit_price|crmMoney:$currency}</font></td>
+            {if $line.tax_amount != ''}
+              <td style="text-align:right;"><font size="1">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>
+            {else}
+              <td style="text-align:right;"><font size="1">{if '{domain.tax_term}'}{ts 1='{domain.tax_term}'}-{/ts}{/if}</font></td>
+            {/if}
+          <td style="text-align:right;"><font size="1">{$line.line_total|crmMoney:'{contribution.currency}'}</font></td>
         </tr>
       {/foreach}
       <tr>
-- 
2.25.1