Merge pull request #6098 from turbo124/v5-develop

Fixes for support messages
This commit is contained in:
David Bomba 2021-06-22 07:29:26 +10:00 committed by GitHub
commit 2ae0b1bb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -66,7 +66,7 @@ class SupportMessageSent extends Mailable
->replyTo($user->email, $user->present()->name()) ->replyTo($user->email, $user->present()->name())
->subject($subject) ->subject($subject)
->view('email.support.message', [ ->view('email.support.message', [
'message' => $this->support_message, 'support_message' => $this->support_message,
'system_info' => $system_info, 'system_info' => $system_info,
'laravel_log' => $log_lines, 'laravel_log' => $log_lines,
'logo' => $company->present()->logo(), 'logo' => $company->present()->logo(),

View File

@ -1,6 +1,6 @@
@component('email.template.admin', ['logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) @component('email.template.admin', ['logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
{{-- Body --}} {{-- Body --}}
{{ $message }} {{ $support_message }}
{!! str_replace('\n', '<br>', $system_info) !!} {!! str_replace('\n', '<br>', $system_info) !!}