mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-30 22:14:33 -04:00
Fixes for company logo in emails
This commit is contained in:
parent
18e8934e70
commit
e7e455667d
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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])
|
||||||
|
@ -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 !!}
|
||||||
|
@ -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 !!}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user