Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use partial due date in email templates

Browse Source
This commit is contained in:
Hillel Coren 2017-10-26 22:18:56 +03:00
parent b14c7ca1b8
commit 22ac0c05a4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/TemplateService.php
View File

@ -45,7 +45,7 @@ class TemplateService
'$emailSignature' => $account->getEmailFooter(),
'$client' => $client->getDisplayName(),
'$account' => $account->getDisplayName(),
'$dueDate' => $account->formatDate($invoice->due_date),
'$dueDate' => $account->formatDate($invoice->partial_due_date ?: $invoice->due_date),
'$invoiceDate' => $account->formatDate($invoice->invoice_date),
'$contact' => $contact->getDisplayName(),
'$firstName' => $contact->first_name,

4
resources/views/emails/design2_html.blade.php
View File

@ -26,9 +26,9 @@
{{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
@else
@if ($account->hasCustomLabel('due_date'))
{{ $account->getLabel('due_date') }} {{ $account->formatDate($invoice->due_date) }}
{{ $account->getLabel('due_date') }} {{ $account->formatDate($invoice->partial_due_date ?: $invoice->due_date) }}
@else
{{ utrans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)]) }}
{{ utrans('texts.due_by', ['date' => $account->formatDate($invoice->partial_due_date ?: $invoice->due_date)]) }}
@endif
@endif
</span><br />

4
resources/views/emails/design3_html.blade.php
View File

@ -26,9 +26,9 @@
{{ strtoupper(trans('texts.valid_until')) }} {{ $account->formatDate($invoice->due_date) }}
@else
@if ($account->hasCustomLabel('due_date'))
{{ $account->getLabel('due_date') }} {{ $account->formatDate($invoice->due_date) }}
{{ $account->getLabel('due_date') }} {{ $account->formatDate($invoice->partial_due_date ?: $invoice->due_date) }}
@else
{{ utrans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)]) }}
{{ utrans('texts.due_by', ['date' => $account->formatDate($invoice->partial_due_date ?: $invoice->due_date)]) }}
@endif
@endif
</span><br />

2
resources/views/partials/email_templates.blade.php
View File

@ -17,7 +17,7 @@
'footer': {!! json_encode($account->getEmailFooter()) !!},
'emailSignature': {!! json_encode($account->getEmailFooter()) !!},
'account': "{{ $account->getDisplayName() }}",
'dueDate': invoice ? invoice.due_date : "{{ $account->formatDate($account->getDateTime()) }}",
'dueDate': invoice ? invoice.partial_due_date || invoice.due_date : "{{ $account->formatDate($account->getDateTime()) }}",
'invoiceDate': invoice ? invoice.invoice_date : "{{ $account->formatDate($account->getDateTime()) }}",
'client': invoice ? getClientDisplayName(invoice.client) : "{{ trans('texts.client_name') }}",
'amount': invoice ? formatMoneyInvoice(parseFloat(invoice.partial) || parseFloat(invoice.balance_amount), invoice) : formatMoneyAccount(100, account),