Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Whitespace cleanup in invoice template #24113

Merged
merged 1 commit into from
Aug 2, 2022
Merged

Whitespace cleanup in invoice template #24113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
View file
Open in desktop
Whitespace-only changes.
72 changes: 26 additions & 46 deletions xml/templates/message_templates/contribution_invoice_receipt_html.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,26 @@
<tr>
<td><font size="1" align="center">{contact.display_name}{if '{contact.current_employer}'} ({contact.current_employer}){/if}</font></td>
<td><font size="1" align="right">{$invoice_date}</font></td>
<td style="white-space: nowrap">
<font size="1" align="right">
<td style="white-space: nowrap"><font size="1" align="right">
{domain.street_address}
{domain.supplemental_address_1}
</font>
</td>
</font></td>
</tr>
<tr>
<td><font size="1" align="center">{$street_address} {$supplemental_address_1}</font></td>
<td><b><font size="1" align="right">{ts}Invoice Number:{/ts}</font></b></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.supplemental_address_2}
{domain.state_province_id:label}
</font>
</td>
</font></td>
</tr>
<tr>
<td><font size="1" align="center">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>
<td><font size="1" align="right">{contribution.invoice_number}</font></td>
<td style="white-space: nowrap">
<font size="1" align="right">
<td style="white-space: nowrap"><font size="1" align="right">
{domain.city}
{domain.postal_code}
</font>
</td>
</font></td>
</tr>
<tr>
<td><font size="1" align="right">{$city} {$postal_code}</font></td>
Expand Down Expand Up @@ -85,8 +79,7 @@
{if $value.description}
<div>{$value.description|truncate:30:"..."}</div>
{/if}
</font>
</td>
</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 != ''}
Expand Down Expand Up @@ -129,8 +122,7 @@
{else}
{ts}Amount Paid{/ts}
{/if}
</font>
</td>
</font></td>
<td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
</tr>
<tr>
Expand Down Expand Up @@ -162,15 +154,17 @@

<table style="margin-top:5px;font-family: Arial, Verdana, sans-serif" width="100%" border="0" cellpadding="5" cellspacing="0" id="desc">
<tr>
<td width="60%"><b><font size="4" align="right">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/><font size="1" align="left"><b>{ts}To:{/ts}</b><div style="width:24em;word-wrap:break-word;">
<td width="60%"><b><font size="4" align="right">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/>
<font size="1" align="left"><b>{ts}To:{/ts}</b><div style="width:24em;word-wrap:break-word;">
{domain.name}<br />
{domain.street_address} {domain.supplemental_address_1}<br />
{domain.supplemental_address_2} {domain.state_province_id:label}<br />
{domain.city} {domain.postal_code}<br />
{domain.country_id:label}<br />
{domain.email}</div>
{domain.phone}<br />
</font><br/><br/><font size="1" align="left">{$notes}</font>
</font>
<br/><br/><font size="1" align="left">{$notes}</font>
</td>
<td width="40%">
<table cellpadding="5" cellspacing="0" width="100%" border="0">
Expand Down Expand Up @@ -225,59 +219,47 @@
<tr>
<td style="padding-left:17px;"><font size="1" align="center">{contact.display_name}{if '{contact.current_employer}'} ({contact.current_employer}){/if}</font></td>
<td style="padding-left:30px;"><font size="1" align="right">{$invoice_date}</font></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.street_address}
{domain.supplemental_address_1}
</font>
</td>
</font></td>
</tr>
<tr>
<td style="padding-left:17px;"><font size="1" align="center">{$street_address} {$supplemental_address_1}</font></td>
<td style="padding-left:30px;"><b><font size="1" align="right">{ts}Credit Note Number:{/ts}</font></b></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.supplemental_address_2}
{domain.state_province_id:label}
</font>
</td>
</font></td>
</tr>
<tr>
<td style="padding-left:17px;"><font size="1" align="center">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>
<td style="padding-left:30px;"><font size="1" align="right">{contribution.creditnote_id}</font></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.city}
{domain.postal_code}
</font>
</td>
</font></td>
</tr>
<tr>
<td style="padding-left:17px;"><font size="1" align="right">{$city} {$postal_code}</font></td>
<td height="10" style="padding-left:30px;"><b><font size="1" align="right">{ts}Reference:{/ts}</font></b></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.country_id:label}
</font>
</td>
</font></td>
</tr>
<tr>
<td></td>
<td style="padding-left:30px;"><font size="1" align="right">{contribution.source}</font></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.email}
</font>
</td>
</font></td>
</tr>
<tr>
<td></td>
<td></td>
<td>
<font size="1" align="right">
<td><font size="1" align="right">
{domain.phone}
</font>
</td>
</font></td>
</tr>
</table>

Expand All @@ -299,8 +281,7 @@
<tr><td colspan="5" style="color:#F5F5F5;"><hr></hr></td></tr>
{/if}
<tr>
<td style ="text-align:left;" >
<font size="1">
<td style ="text-align:left;" ><font size="1">
{if $value.html_type eq 'Text'}
{$value.label}
{else}
Expand All @@ -309,8 +290,7 @@
{if $value.description}
<div>{$value.description|truncate:30:"..."}</div>
{/if}
</font>
</td>
</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 != ''}
Expand Down