mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-20 15:57:41 -07:00
Merge pull request #12125 from inietov/fixes/email_issues
Fixed #11699 and #12065 Email issues
This commit is contained in:
commit
6113afe36e
|
@ -1,13 +1,18 @@
|
||||||
@component('mail::layout')
|
@component('mail::layout')
|
||||||
{{-- Header --}}
|
{{-- Header --}}
|
||||||
@slot('header')
|
@slot('header')
|
||||||
@component('mail::header', ['url' => config('app.url')])
|
|
||||||
|
|
||||||
{{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}}
|
{{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}}
|
||||||
|
|
||||||
|
|
||||||
@if (isset($snipeSettings) && ($snipeSettings::setupCompleted()))
|
@if (isset($snipeSettings) && ($snipeSettings::setupCompleted()))
|
||||||
|
|
||||||
|
@if ($snipeSettings->show_url_in_emails=='1' )
|
||||||
|
@component('mail::header', ['url' => config('app.url')])
|
||||||
|
@else
|
||||||
|
@component('mail::header', ['url' => ''])
|
||||||
|
@endif
|
||||||
|
|
||||||
{{-- Show images in email! --}}
|
{{-- Show images in email! --}}
|
||||||
@if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
|
@if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
|
||||||
|
|
||||||
|
|
|
@ -73,16 +73,26 @@ $style = [
|
||||||
<td style="{{ $style['email-masthead'] }}">
|
<td style="{{ $style['email-masthead'] }}">
|
||||||
|
|
||||||
@if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
|
@if (($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
|
||||||
|
@php
|
||||||
|
$logo = '';
|
||||||
|
if ($snipeSettings->logo != ''){
|
||||||
|
$logo = $snipeSettings->logo;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($snipeSettings->email_logo != ''){
|
||||||
|
$logo = $snipeSettings->email_logo;
|
||||||
|
}
|
||||||
|
@endphp
|
||||||
|
|
||||||
@if ($snipeSettings->brand == '3')
|
@if ($snipeSettings->brand == '3')
|
||||||
@if ($snipeSettings->logo!='')
|
@if ($logo!='')
|
||||||
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
|
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
|
||||||
@endif
|
@endif
|
||||||
{{ $snipeSettings->site_name }}
|
{{ $snipeSettings->site_name }}
|
||||||
|
|
||||||
@elseif ($snipeSettings->brand == '2')
|
@elseif ($snipeSettings->brand == '2')
|
||||||
@if ($snipeSettings->logo!='')
|
@if ($logo!='')
|
||||||
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
|
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
|
||||||
@endif
|
@endif
|
||||||
@else
|
@else
|
||||||
{{ $snipeSettings->site_name }}
|
{{ $snipeSettings->site_name }}
|
||||||
|
|
Loading…
Reference in a new issue