From a233e585dccec18798be250844bcfe19a9cf681a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 20 Nov 2022 20:21:27 +1100 Subject: [PATCH 1/4] fixes for failed email sending --- app/Listeners/Invoice/InvoiceEmailFailedActivity.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index 4955cb95f6..4648253504 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -14,16 +14,12 @@ namespace App\Listeners\Invoice; use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; -use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Queue\SerializesModels; + use stdClass; class InvoiceEmailFailedActivity implements ShouldQueue { - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public $delay = 10; From 3cb6c28a79db75dea546ce90f8814e3621be29d9 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 21 Nov 2022 07:38:41 +1100 Subject: [PATCH 2/4] remove delay from events --- app/Listeners/Invoice/InvoiceEmailFailedActivity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index 4955cb95f6..4453bb234f 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -25,7 +25,7 @@ class InvoiceEmailFailedActivity implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - public $delay = 10; + // public $delay = 10; protected $activity_repo; From f46ed1950d62d3f2ef1c7682b6a38bd09203db1a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 21 Nov 2022 07:45:44 +1100 Subject: [PATCH 3/4] Clean up --- app/Listeners/Invoice/InvoiceEmailFailedActivity.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index 5fe9a6a485..6a7ffe3e86 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -15,7 +15,6 @@ use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; - use stdClass; class InvoiceEmailFailedActivity implements ShouldQueue From f0e45bda7672d908064f64a342fe48b396bec868 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 21 Nov 2022 08:28:47 +1100 Subject: [PATCH 4/4] Escape variables in custom designs --- app/Http/Requests/Company/UpdateCompanyRequest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index 94797598d4..16efe91040 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -108,6 +108,8 @@ class UpdateCompanyRequest extends Request } } + $settings['email_style_custom'] = str_replace("{{", "", $settings['email_style_custom']); + if (! $account->isFreeHostedClient()) { return $settings; }