1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00

Show 'Valid until' for quotes in HTML emails

This commit is contained in:
Hillel Coren 2016-08-17 13:17:24 +03:00
parent 6675814f8d
commit 886d7f6e12
2 changed files with 14 additions and 6 deletions

View File

@ -12,7 +12,7 @@
</tr> </tr>
<tr> <tr>
<td style="border-collapse: collapse;"> <td style="border-collapse: collapse;">
<table cellpadding="10" cellspacing="0" border="0" bgcolor="#F4F5F5" width="600" align="center" <table cellpadding="10" cellspacing="0" border="0" bgcolor="#F4F5F5" width="600" align="center"
class="header" style="border-top-width: 6px; border-top-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-top-style: solid;"> class="header" style="border-top-width: 6px; border-top-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-top-style: solid;">
<tr> <tr>
<td class="logo" width="208" style="border-collapse: collapse; vertical-align: middle;" valign="middle"> <td class="logo" width="208" style="border-collapse: collapse; vertical-align: middle;" valign="middle">
@ -22,7 +22,11 @@
<p class="left" style="line-height: 22px; margin: 0; padding: 2px 0 0;"> <p class="left" style="line-height: 22px; margin: 0; padding: 2px 0 0;">
@if ($invoice->due_date) @if ($invoice->due_date)
<span style="font-size: 11px; color: #8f8d8e;"> <span style="font-size: 11px; color: #8f8d8e;">
{{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }} @if ($invoice->isQuote())
{{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
@else
{{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
@endif
</span><br /> </span><br />
@endif @endif
<span style="font-size: 18px;"> <span style="font-size: 18px;">
@ -66,4 +70,4 @@
<strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong> <strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong>
@endif @endif
</p> </p>
@stop @stop

View File

@ -12,7 +12,7 @@
</tr> </tr>
<tr> <tr>
<td style="border-collapse: collapse;"> <td style="border-collapse: collapse;">
<table cellpadding="10" cellspacing="0" border="0" bgcolor="{{ $account->primary_color ?: '#2E2B2B' }}" width="600" align="center" class="header" <table cellpadding="10" cellspacing="0" border="0" bgcolor="{{ $account->primary_color ?: '#2E2B2B' }}" width="600" align="center" class="header"
style="border-bottom-width: 6px; border-bottom-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-bottom-style: solid;"> style="border-bottom-width: 6px; border-bottom-color: {{ $account->primary_color ?: '#2E2B2B' }}; border-bottom-style: solid;">
<tr> <tr>
<td class="logo" width="205" style="border-collapse: collapse; vertical-align: middle; line-height: 16px;" valign="middle"> <td class="logo" width="205" style="border-collapse: collapse; vertical-align: middle; line-height: 16px;" valign="middle">
@ -22,7 +22,11 @@
<p class="left" style="line-height: 22px; margin: 3px 0 0; padding: 0;"> <p class="left" style="line-height: 22px; margin: 3px 0 0; padding: 0;">
@if ($invoice->due_date) @if ($invoice->due_date)
<span style="font-size: 11px; color: #8f8d8e;"> <span style="font-size: 11px; color: #8f8d8e;">
{{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }} @if ($invoice->isQuote())
{{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
@else
{{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }}
@endif
</span><br /> </span><br />
@endif @endif
<span style="font-size: 19px; color: #FFFFFF;"> <span style="font-size: 19px; color: #FFFFFF;">
@ -66,4 +70,4 @@
<strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong> <strong><a href="{{ $account->present()->website }}" style="color: #A7A6A6; text-decoration: none; font-weight: bold; font-size: 10px;">{{ $account->website }}</a></strong>
@endif @endif
</p> </p>
@stop @stop