mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 20:18:33 -05:00 
			
		
		
		
	Merge pull request #6098 from turbo124/v5-develop
Fixes for support messages
This commit is contained in:
		
						commit
						2ae0b1bb22
					
				@ -66,7 +66,7 @@ class SupportMessageSent extends Mailable
 | 
			
		||||
                ->replyTo($user->email, $user->present()->name())
 | 
			
		||||
                ->subject($subject)
 | 
			
		||||
                ->view('email.support.message', [
 | 
			
		||||
                    'message' => $this->support_message,
 | 
			
		||||
                    'support_message' => $this->support_message,
 | 
			
		||||
                    'system_info' => $system_info,
 | 
			
		||||
                    'laravel_log' => $log_lines,
 | 
			
		||||
                    'logo' => $company->present()->logo(),
 | 
			
		||||
 | 
			
		||||
@ -1,6 +1,6 @@
 | 
			
		||||
@component('email.template.admin', ['logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png'])
 | 
			
		||||
    {{-- Body --}}
 | 
			
		||||
    {{ $message }}
 | 
			
		||||
    {{ $support_message }}
 | 
			
		||||
 | 
			
		||||
    {!! str_replace('\n', '<br>', $system_info) !!}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user