Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for plain text emails

Browse Source
This commit is contained in:
David Bomba 2023-07-06 21:16:18 +10:00
parent 77af583f25
commit e2ed2fa2b2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/EmailController.php
View File

@ -14,7 +14,6 @@ namespace App\Http\Controllers;
use App\Events\Credit\CreditWasEmailed; use App\Events\Credit\CreditWasEmailed;
use App\Events\Quote\QuoteWasEmailed; use App\Events\Quote\QuoteWasEmailed;
use App\Http\Requests\Email\SendEmailRequest; use App\Http\Requests\Email\SendEmailRequest;
use App\Jobs\Entity\EmailEntity;
use App\Jobs\PurchaseOrder\PurchaseOrderEmail; use App\Jobs\PurchaseOrder\PurchaseOrderEmail;
use App\Models\Credit; use App\Models\Credit;
use App\Models\Invoice; use App\Models\Invoice;
@ -30,7 +29,6 @@ use App\Transformers\QuoteTransformer;
use App\Transformers\RecurringInvoiceTransformer; use App\Transformers\RecurringInvoiceTransformer;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Http\Response;
use Illuminate\Mail\Mailables\Address; use Illuminate\Mail\Mailables\Address;
class EmailController extends BaseController class EmailController extends BaseController

8
app/Services/Email/EmailDefaults.php
View File

@ -180,7 +180,10 @@ class EmailDefaults
$this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale); $this->email->email_object->body = EmailTemplateDefaults::getDefaultTemplate($this->email->email_object->email_template_body, $this->locale);
} }
$this->email->email_object->text_body = strip_tags($this->email->email_object->body); $breaks = ["<br />","<br>","<br/>"];
$this->email->email_object->text_body = str_ireplace($breaks, "\r\n", $this->email->email_object->body);
$this->email->email_object->text_body = strip_tags($this->email->email_object->text_body);
$this->email->email_object->text_body = str_replace('$view_button', '$view_url', $this->email->email_object->text_body);
if ($this->template == 'email.template.custom') { if ($this->template == 'email.template.custom') {
$this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom))); $this->email->email_object->body = (str_replace('$body', $this->email->email_object->body, str_replace(["\r","\n"], "", $this->email->email_object->settings->email_style_custom)));
@ -226,8 +229,11 @@ class EmailDefaults
*/ */
public function setVariables(): self public function setVariables(): self
{ {
$this->email->email_object->body = strtr($this->email->email_object->body, $this->email->email_object->variables); $this->email->email_object->body = strtr($this->email->email_object->body, $this->email->email_object->variables);
$this->email->email_object->text_body = strtr($this->email->email_object->text_body, $this->email->email_object->variables);
$this->email->email_object->subject = strtr($this->email->email_object->subject, $this->email->email_object->variables); $this->email->email_object->subject = strtr($this->email->email_object->subject, $this->email->email_object->variables);