mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-10 21:22:58 +01:00
Merge pull request #5085 from turbo124/v5-develop
Fixes for company logo in emails
This commit is contained in:
commit
f61af5f96f
@ -26,7 +26,7 @@ class Helpers
|
||||
$elements['signature'] = '';
|
||||
$elements['settings'] = new stdClass;
|
||||
$elements['whitelabel'] = true;
|
||||
|
||||
$elements['company'] = '';
|
||||
return $elements;
|
||||
}
|
||||
|
||||
@ -35,7 +35,8 @@ class Helpers
|
||||
$elements['signature'] = $_settings->email_signature;
|
||||
$elements['settings'] = $_settings;
|
||||
$elements['whitelabel'] = $client->user->account->isPaid() ? true : false;
|
||||
|
||||
$elements['company'] = $client->company;
|
||||
|
||||
return $elements;
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
@component('email.template.master', ['design' => 'light', 'whitelabel' => false])
|
||||
@component('email.template.master', ['design' => 'light', 'whitelabel' => false, 'company' => $company])
|
||||
|
||||
@slot('header')
|
||||
@include('email.components.header', ['logo' => $logo])
|
||||
|
@ -1,7 +1,7 @@
|
||||
@component('email.template.master', ['design' => 'dark', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
||||
|
||||
@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
|
||||
|
||||
{!! $body !!}
|
||||
|
@ -1,7 +1,7 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' => $settings, 'whitelabel' => $whitelabel])
|
||||
|
||||
@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
|
||||
|
||||
{!! $body !!}
|
||||
|
Loading…
Reference in New Issue
Block a user