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

Email Quote displays wrong language strings #1499

Browse Source
This commit is contained in:
Hillel Coren 2017-05-22 12:33:33 +03:00
parent 90f9247362
commit 20accda2f0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/invoices/email.blade.php
View File

@ -4,7 +4,7 @@
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="emailModalLabel">{{ trans('texts.email_invoice') }}</h4> <h4 class="modal-title" id="emailModalLabel">{{ trans($invoice->isQuote() ? 'texts.email_quote' : 'texts.email_invoice') }}</h4>
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
@ -225,7 +225,7 @@
NINJA.formIsChanged = true; NINJA.formIsChanged = true;
}); });
@if (Utils::isPro()) @if (Utils::isPro() && $invoice->isStandard())
if (window.defaultTemplate) { if (window.defaultTemplate) {
$('#template_type').val(window.defaultTemplate); $('#template_type').val(window.defaultTemplate);
} }

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

@ -28,7 +28,9 @@
'password': passwordHtml, 'password': passwordHtml,
'documents': documentsHtml, 'documents': documentsHtml,
'viewLink': '{{ link_to('#', url('/view/...')) }}$password', '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', 'paymentLink': '{{ link_to('#', url('/payment/...')) }}$password',
'paymentButton': '{!! Form::flatButton('pay_now', '#36c157') !!}$password', 'paymentButton': '{!! Form::flatButton('pay_now', '#36c157') !!}$password',
'autoBill': '{{ trans('texts.auto_bill_notification_placeholder') }}', 'autoBill': '{{ trans('texts.auto_bill_notification_placeholder') }}',