Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-05 03:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Skip post-table processing for emails

Browse Source
This commit is contained in:
Benjamin Beganović 2021-06-23 10:46:51 +02:00
parent f6c9a3a6a3
commit 38504e2d53
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Mail/TemplateEmail.php
View File

@ -63,9 +63,9 @@ class TemplateEmail extends Mailable
DesignHelpers::parseMarkdownToHtml($this->build_email->getBody()) DesignHelpers::parseMarkdownToHtml($this->build_email->getBody())
); );
$this->build_email->setBody( // $this->build_email->setBody(
TemplateEngine::wrapElementsIntoTables('<div id="content-wrapper"></div>', $this->build_email->getBody(), $settings) // TemplateEngine::wrapElementsIntoTables('<div id="content-wrapper"></div>', $this->build_email->getBody(), $settings)
); // );
} }
$company = $this->client->company; $company = $this->client->company;

4
app/Utils/TemplateEngine.php
View File

@ -212,7 +212,7 @@ class TemplateEngine
} else { } else {
$wrapper = ''; $wrapper = '';
} }
} }
elseif ($email_style == 'plain') { elseif ($email_style == 'plain') {
$wrapper = view($this->getTemplatePath($email_style), $data)->render(); $wrapper = view($this->getTemplatePath($email_style), $data)->render();
$injection = ''; $injection = '';
@ -226,7 +226,7 @@ class TemplateEngine
$data = [ $data = [
'subject' => $this->subject, 'subject' => $this->subject,
'body' => $email_style == 'custom' ? $this->body : self::wrapElementsIntoTables(strtr('<div id="content-wrapper"></div>', ['$body' => '']), $this->body, $this->entity_obj->client->getMergedSettings()), 'body' => $this->body,
'wrapper' => $wrapper, 'wrapper' => $wrapper,
'raw_body' => $this->raw_body, 'raw_body' => $this->raw_body,
'raw_subject' => $this->raw_subject 'raw_subject' => $this->raw_subject