From 20accda2f0c958763ed1faeb35d04d920c4a93a0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 22 May 2017 12:33:33 +0300 Subject: [PATCH] Email Quote displays wrong language strings #1499 --- resources/views/invoices/email.blade.php | 4 ++-- resources/views/partials/email_templates.blade.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/views/invoices/email.blade.php b/resources/views/invoices/email.blade.php index 24d87c53c762..1e6a56423a50 100644 --- a/resources/views/invoices/email.blade.php +++ b/resources/views/invoices/email.blade.php @@ -4,7 +4,7 @@
@@ -225,7 +225,7 @@ NINJA.formIsChanged = true; }); - @if (Utils::isPro()) + @if (Utils::isPro() && $invoice->isStandard()) if (window.defaultTemplate) { $('#template_type').val(window.defaultTemplate); } diff --git a/resources/views/partials/email_templates.blade.php b/resources/views/partials/email_templates.blade.php index 91f1bfb74226..5aa12fa725b5 100644 --- a/resources/views/partials/email_templates.blade.php +++ b/resources/views/partials/email_templates.blade.php @@ -28,7 +28,9 @@ 'password': passwordHtml, 'documents': documentsHtml, 'viewLink': '{{ link_to('#', url('/view/...')) }}$password', - 'viewButton': '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password', + 'viewButton': invoice && invoice.invoice_type_id == {{ INVOICE_TYPE_QUOTE }} ? + '{!! Form::flatButton('view_quote', '#0b4d78') !!}$password' : + '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password', 'paymentLink': '{{ link_to('#', url('/payment/...')) }}$password', 'paymentButton': '{!! Form::flatButton('pay_now', '#36c157') !!}$password', 'autoBill': '{{ trans('texts.auto_bill_notification_placeholder') }}',