Skip to content

Commit

Permalink
dev/core#2035 Invoice template - show Amount paid even when it is ful…
Browse files Browse the repository at this point in the history
…ly paid

In https://github.com/civicrm/civicrm-core/pull/16680/files?w=1#diff-b211e0dac858fdad5d480c118d645e0bR129 there was a change from
'show amount paid & due depending on pay-later status' to 'show amount paid & due depending on whether payment is due'

This has been experienced as a regression and, being an invoice, there seems no reason to only change it sometimes.

This change just alters the template that new installs will receive. If approved another step is needed to update existing
installs (unless they have customised the template)
  • Loading branch information
eileenmcnaughton committed Sep 26, 2020
1 parent 9920a68 commit 2fd8c13
Showing 1 changed file with 22 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,29 +126,28 @@
<td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
<td style="text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
</tr>
{if $amountDue != 0}
<tr>
<td colspan="3"></td>
<td style="text-align:right;white-space: nowrap"><font size="1">
{if $contribution_status_id == $refundedStatusId}
{ts}Amount Credited{/ts}
{else}
{ts}Amount Paid{/ts}
{/if}
</font>
</td>
<td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
</tr>
<tr>
<td colspan="3"></td>
<td colspan="2"><hr></hr></td>
</tr>
<tr>
<td colspan="3"></td>
<td style="text-align:right;white-space: nowrap" ><b><font size="1">{ts}AMOUNT DUE:{/ts}</font></b></td>
<td style="text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
</tr>
{/if}
<tr>
<td colspan="3"></td>
<td style="text-align:right;white-space: nowrap"><font size="1">
{if $contribution_status_id == $refundedStatusId}
{ts}Amount Credited{/ts}
{else}
{ts}Amount Paid{/ts}
{/if}
</font>
</td>
<td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
</tr>
<tr>
<td colspan="3"></td>
<td colspan="2"><hr></hr></td>
</tr>
<tr>
<td colspan="3"></td>
<td style="text-align:right;white-space: nowrap" ><b><font size="1">{ts}AMOUNT DUE:{/ts}</font></b></td>
<td style="text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
</tr>

<br/><br/><br/>
<tr>
<td colspan="5"></td>
Expand Down

0 comments on commit 2fd8c13

Please sign in to comment.