Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-20 18:41:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Benjamin Beganović 2021-04-22 13:03:30 +02:00
parent 6d0c2ec5ca
commit b9ee87b124
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Utils/TemplateEngine.php
View File

@ -183,10 +183,6 @@ class TemplateEngine
if ($email_style !== 'custom') { if ($email_style !== 'custom') {
$this->body = DesignHelpers::parseMarkdownToHtml($this->body); $this->body = DesignHelpers::parseMarkdownToHtml($this->body);
} }
if ($email_style == 'custom') {
}
} }
private function renderTemplate() private function renderTemplate()
@ -220,13 +216,9 @@ class TemplateEngine
$wrapper = str_replace('<head>', $injection, $wrapper); $wrapper = str_replace('<head>', $injection, $wrapper);
} }
// $body = $email_style == 'custom'
// ? $this->body
// : self::wrapElementsIntoTables(strtr($wrapper, ['$body' => '']), $this->body, $this->entity_obj->client->getMergedSettings());
$data = [ $data = [
'subject' => $this->subject, 'subject' => $this->subject,
'body' => $this->body, 'body' => $email_style == 'custom' ? $this->body : self::wrapElementsIntoTables(strtr('<div id="content-wrapper"></div>', ['$body' => '']), $this->body, $this->entity_obj->client->getMergedSettings()),
'wrapper' => $wrapper, 'wrapper' => $wrapper,
'raw_body' => $this->raw_body, 'raw_body' => $this->raw_body,
'raw_subject' => $this->raw_subject 'raw_subject' => $this->raw_subject
@ -283,7 +275,7 @@ class TemplateEngine
public static function wrapElementsIntoTables(string $wrapper, string $body, $settings): ?string public static function wrapElementsIntoTables(string $wrapper, string $body, $settings): ?string
{ {
$documents['wrapper'] = new \DOMDocument(); $documents['wrapper'] = new \DOMDocument();
$documents['wrapper']->loadHTML($wrapper); @$documents['wrapper']->loadHTML($wrapper);
$documents['master'] = new \DOMDocument(); $documents['master'] = new \DOMDocument();

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

@ -224,11 +224,15 @@
<div class="u-col u-col-100" style="max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;"> <div class="u-col u-col-100" style="max-width: 320px;min-width: 500px;display: table-cell;vertical-align: top;">
<div style="width: 100% !important;"> <div style="width: 100% !important;">
<!--[if (!mso)&(!IE)]><!--><div style="padding: 11px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;"><!--<![endif]--> <!--[if (!mso)&(!IE)]><!--><div style="padding: 11px;border-top: 0px solid transparent;border-left: 0px solid transparent;border-right: 0px solid transparent;border-bottom: 0px solid transparent;"><!--<![endif]-->
<div id="content-wrapper"> <div class="content-contrast-color">
@yield('greeting') @yield('greeting')
</div>
<div id="content-wrapper">
{{ $slot }} {{ $slot }}
</div>
<div class="content-contrast-color">
@yield('signature') @yield('signature')
@yield('footer') @yield('footer')
</div> </div>