From 1a27cf27d102e625384ed1fd5bb8fc90f8663689 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 27 Apr 2017 20:22:05 +0300 Subject: [PATCH] Wrong in invoice email preview #1462 --- resources/views/partials/email_templates.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/email_templates.blade.php b/resources/views/partials/email_templates.blade.php index 7f02ab7bc59b..91f1bfb74226 100644 --- a/resources/views/partials/email_templates.blade.php +++ b/resources/views/partials/email_templates.blade.php @@ -17,8 +17,8 @@ 'footer': {!! json_encode($account->getEmailFooter()) !!}, 'emailSignature': {!! json_encode($account->getEmailFooter()) !!}, 'account': "{{ $account->getDisplayName() }}", - 'dueDate': "{{ $account->formatDate($account->getDateTime()) }}", - 'invoiceDate': "{{ $account->formatDate($account->getDateTime()) }}", + 'dueDate': invoice ? 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), 'contact': invoice ? getContactDisplayName(invoice.client.contacts[0]) : 'Contact Name',