Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4733 from beganovich/v5-2001-email-improvements

Browse Source 
(v5) E-mail improvements & fixes
This commit is contained in:
Benjamin Beganović 2021-01-20 13:19:50 +01:00 committed by GitHub
commit 8391787d6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Mail/Admin/EntitySentObject.php
View File

@ -14,7 +14,7 @@ namespace App\Mail\Admin;
use App\Utils\Number; use App\Utils\Number;
use stdClass; use stdClass;
class EntityFailedSendObject class EntitySentObject
{ {
public $invitation; public $invitation;

4
app/Utils/TemplateEngine.php
View File

@ -197,7 +197,7 @@ class TemplateEngine
} }
} else { } else {
$wrapper = view($this->getTemplatePath($email_style), $data)->render(); $wrapper = view($this->getTemplatePath($email_style), $data)->render();
$injection = '<head><link rel="stylesheet" type="text/css" property="stylesheet" href="'.config('ninja.app_url').'/css/tailwind-1.2.0.css">'; $injection = '';
$wrapper = str_replace('<head>', $injection, $wrapper); $wrapper = str_replace('<head>', $injection, $wrapper);
} }
@ -208,7 +208,7 @@ class TemplateEngine
'raw_body' => $this->raw_body, 'raw_body' => $this->raw_body,
'raw_subject' => $this->raw_subject 'raw_subject' => $this->raw_subject
]; ];
$this->tearDown(); $this->tearDown();
return $data; return $data;

20
config/css-inliner.php
View File

@ -1,20 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Css Files
|--------------------------------------------------------------------------
|
| Css file of your style for your emails
| The content of these files will be added directly into the inliner
| Use absolute paths, ie. public_path('css/main.css')
|
*/
'css-files' => [
public_path('css/app.css'),
],
];

1
public/css/tailwind-1.2.0.css vendored
View File

File diff suppressed because one or more lines are too long

1
public/css/tailwindcss@1.4.6.css vendored
View File

File diff suppressed because one or more lines are too long

42
resources/views/email/admin/generic.blade.php
View File

@ -1,26 +1,26 @@
@component('email.template.master', ['design' => 'light', 'settings' =>$settings]) @component('email.template.master', ['design' => 'light', 'settings' => $settings])
@slot('header') @slot('header')
@component('email.components.header', ['p' => $title, 'logo' => $logo]) @include('email.components.header', ['logo' => $logo])
@endslot
<h1>{{ $title }}</h1>
@slot('greeting')
@lang($message)
@endslot
@component('email.components.button', ['url' => $url])
@lang($button)
@endcomponent @endcomponent
@endslot
@slot('greeting') @slot('signature')
@lang($message) {{ $signature }}
@endslot @endslot
@component('email.components.button', ['url' => $url]) @slot('footer')
@lang($button) @component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; InvoiceNinja'])
For any info, please visit InvoiceNinja.
@endcomponent
@endslot
@endcomponent @endcomponent
@slot('signature')
{{ $signature }}
@endslot
@slot('footer')
@component('email.components.footer', ['url' => 'https://invoiceninja.com', 'url_text' => '&copy; InvoiceNinja'])
For any info, please visit InvoiceNinja.
@endcomponent
@endslot
@endcomponent

6
resources/views/email/components/button.blade.php
View File

@ -1,3 +1,3 @@
<div class="px-10 py-6 flex flex-col items-center"> <a href="{{ $url }}" target="_blank" class="button">
<a href="{{ $url }}" class="bg-green-500 px-4 py-3 text-white leading-tight hover:bg-green-600" style="color: white !important;">{{ $slot }}</a> {{ $slot }}
</div> </a>

22
resources/views/email/components/footer.blade.php
View File

@ -1,13 +1,11 @@
<div class="mt-8 text-center break-words"> <p>{{ $slot }}</p>
<p class="block text-center text-sm break-words">{{ $slot }}</p>
@isset($url) @isset($url)
<a href="{{ $url }}" class="text-blue-500 hover:text-blue-600 mt-4 text-sm break-words"> <a href="{{ $url }}" target="_blank">
@isset($url_text) @isset($url_text)
{!! $url_text !!} {!! $url_text !!}
@else @else
{{ $url }} {{ $url }}
@endisset @endisset
</a> </a>
@endisset @endisset
</div>

5
resources/views/email/template/master.blade.php
View File

@ -64,7 +64,12 @@
<table cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <table cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;">
<tr> <tr>
<td align="center" id="email-content"> <td align="center" id="email-content">
@yield('greeting')
{{ $slot }} {{ $slot }}
@yield('signature')
@yield('footer')
</td> </td>
</tr> </tr>
</table> </table>