Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 05:27:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5085 from turbo124/v5-develop

Browse Source 
Fixes for company logo in emails
This commit is contained in:
David Bomba 2021-03-10 12:51:23 +11:00 committed by GitHub
commit f61af5f96f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Utils/Helpers.php
View File

@ -26,7 +26,7 @@ class Helpers
$elements['signature'] = ''; $elements['signature'] = '';
$elements['settings'] = new stdClass; $elements['settings'] = new stdClass;
$elements['whitelabel'] = true; $elements['whitelabel'] = true;
$elements['company'] = '';
return $elements; return $elements;
} }
@ -35,6 +35,7 @@ class Helpers
$elements['signature'] = $_settings->email_signature; $elements['signature'] = $_settings->email_signature;
$elements['settings'] = $_settings; $elements['settings'] = $_settings;
$elements['whitelabel'] = $client->user->account->isPaid() ? true : false; $elements['whitelabel'] = $client->user->account->isPaid() ? true : false;
$elements['company'] = $client->company;
return $elements; return $elements;
} }

2
resources/views/email/auth/password-reset.blade.php
View File

@ -1,4 +1,4 @@
@component('email.template.master', ['design' => 'light', 'whitelabel' => false]) @component('email.template.master', ['design' => 'light', 'whitelabel' => false, 'company' => $company])
@slot('header') @slot('header')
@include('email.components.header', ['logo' => $logo]) @include('email.components.header', ['logo' => $logo])

2
resources/views/email/template/dark.blade.php
View File

@ -1,7 +1,7 @@
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel]) @component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
@slot('header') @slot('header')
@include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) @include('email.components.header', ['logo' => $company->present()->logo($settings)])
@endslot @endslot
{!! $body !!} {!! $body !!}

2
resources/views/email/template/light.blade.php
View File

@ -1,7 +1,7 @@
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel]) @component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
@slot('header') @slot('header')
@include('email.components.header', ['logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) @include('email.components.header', ['logo' => $company->present()->logo($settings)])
@endslot @endslot
{!! $body !!} {!! $body !!}