Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-12 22:22:32 +01:00
Code Issues Releases Activity

Fixes for displaying company logo in email templates

Browse Source
This commit is contained in:
David Bomba 2021-01-13 12:22:23 +11:00
parent 249c0e8b2b
commit eb7cee706d
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Utils/TemplateEngine.php
View File

@ -150,11 +150,8 @@ class TemplateEngine
private function entityValues($contact) private function entityValues($contact)
{ {
//$data = $this->entity_obj->buildLabelsAndValues($contact);
$data = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues(); $data = (new HtmlEngine($this->entity_obj->invitations->first()))->generateLabelsAndValues();
// $arrKeysLength = array_map('strlen', array_keys($data));
// array_multisort($arrKeysLength, SORT_DESC, $data);
$this->body = strtr($this->body, $data['labels']); $this->body = strtr($this->body, $data['labels']);
$this->body = strtr($this->body, $data['values']); $this->body = strtr($this->body, $data['values']);

2
resources/views/email/partials/company_logo.blade.php
View File

@ -3,7 +3,7 @@
<a href="{{ $settings->website }}" style="color: #19BB40; text-decoration: underline;"> <a href="{{ $settings->website }}" style="color: #19BB40; text-decoration: underline;">
@endif @endif
<img src="{{ $company->present()->logo() }}" height="50" style="height:50px; max-width:140px; margin-left: 33px; padding-top: 2px" alt=""/> <img src="{{ $company->present()->logo($settings) }}" height="50" style="height:50px; max-width:140px; margin-left: 33px; padding-top: 2px" alt=""/>
@if ($settings->website) @if ($settings->website)
</a> </a>

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')
@component('email.components.header', ['p' => $body, (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png']) @component('email.components.header', ['p' => $body, 'logo' => (strlen($settings->company_logo) > 1) ? url('') . $settings->company_logo : 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png'])
@if(isset($title)) @if(isset($title))
{{$title}} {{$title}}