DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12125 from inietov/fixes/email_issues

Browse source 
Fixed #11699 and #12065 Email issues
This commit is contained in:
snipe 2022-11-28 14:09:42 -08:00 committed by GitHub
parent 305df42f92 f0ecab7bb1
commit 6113afe36e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
resources/views/vendor/mail/html/message.blade.php vendored
View file

@ -1,13 +1,18 @@
@component('mail::layout')
{{-- 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 --}}
@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! --}}
@if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))

18
resources/views/vendor/notifications/email.blade.php vendored
View file

@ -73,16 +73,26 @@ $style = [
<td style="{{ $style['email-masthead'] }}">
@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->logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@if ($logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
@endif
{{ $snipeSettings->site_name }}
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@if ($logo!='')
<img class="navbar-brand-img logo" style="max-width: 50px;" src="{{ url('/') }}/uploads/{{ $logo }}">
@endif
@else
{{ $snipeSettings->site_name }}