From 7228eae76fd72cbb158b41259be306c085017820 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 2 Aug 2022 20:06:07 +1200
Subject: [PATCH] Update lineItem section in refunded part to use lineItem

---
 .../contribution_invoice_receipt_html.tpl     | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index f2cf24f97c..8c31dd1abf 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -72,9 +72,6 @@
         <tr>
           <td style="text-align:left;nowrap"><font size="1">
             {$line.title}
-            {if $line.description}
-              <div>{$line.description|truncate:30:"..."}</div>
-            {/if}
           </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>
@@ -270,31 +267,20 @@
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{domain.tax_term}</font></th>
               <th style="padding-left:28px;text-align:right;font-weight:bold;"><font size="1">{ts 1=$currency}Amount %1{/ts}</font></th>
             </tr>
-            {foreach from=$lineItem item=value key=priceset name=pricevalue}
-              {if $smarty.foreach.pricevalue.index eq 0}
-                <tr><td colspan="5"><hr size="3" style="color:#000;"></hr></td></tr>
-              {else}
-                <tr><td colspan="5" style="color:#F5F5F5;"><hr></hr></td></tr>
-              {/if}
+            {foreach from=$lineItems item=line key=index}
+              <tr><td colspan="5"><hr {if $index == 0}size="3" style="color:#000;"{else}style="color:#F5F5F5;"{/if}></hr></td></tr>
               <tr>
                 <td style ="text-align:left;"  ><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>
-                  {/if}
+                  {$line.title}
                 </font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$value.qty}</font></td>
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$value.unit_price|crmMoney:$currency}</font></td>
-                {if $value.tax_amount != ''}
-                  <td style="padding-left:28px;text-align:right;"><font size="1">{if $value.tax_rate}{$value.tax_rate}%{/if}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.qty}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.unit_price|crmMoney:$currency}</font></td>
+                {if $line.tax_amount != ''}
+                  <td style="padding-left:28px;text-align:right;"><font size="1">{if $line.tax_rate}{$line.tax_rate|crmNumberFormat}%{/if}</font></td>
                 {else}
                   <td style="padding-left:28px;text-align:right"><font size="1">{if '{domain.tax_term}'}{ts 1='{domain.tax_term}'}No %1{/ts}{/if}</font></td>
                 {/if}
-                <td style="padding-left:28px;text-align:right;"><font size="1">{$value.subTotal|crmMoney:$currency}</font></td>
+                <td style="padding-left:28px;text-align:right;"><font size="1">{$line.line_total|crmMoney:'{contribution.currency}'}</font></td>
               </tr>
             {/foreach}
             <tr><td colspan="5" style="color:#F5F5F5;"><hr></hr></td></tr>
-- 
2.25.1