From 2ba6f87fa104420533813806e204752d7eea425c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Fri, 19 Nov 2021 11:36:02 +0300 Subject: [PATCH] skip email templates of disabled modules #2315 --- app/Http/Controllers/Settings/Email.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php index 9b8d42e7a..6992c33e9 100644 --- a/app/Http/Controllers/Settings/Email.php +++ b/app/Http/Controllers/Settings/Email.php @@ -7,11 +7,14 @@ use App\Http\Requests\Setting\Setting as Request; use App\Jobs\Setting\UpdateEmailTemplate; use App\Models\Common\Company; use App\Models\Common\EmailTemplate; +use App\Traits\Modules; use App\Utilities\Installer; use Illuminate\Support\Str; class Email extends Controller { + use Modules; + public $skip_keys = ['company_id', '_method', '_token', '_prefix']; /** @@ -33,7 +36,15 @@ class Email extends Controller public function edit() { - $templates = EmailTemplate::all(); + $templates = EmailTemplate::all()->reject(function($template) { + if (Str::startsWith($template->class, 'App')) { + return false; + } + + $class = explode('\\', $template->class); + + return $this->moduleIsDisabled(Str::kebab($class[1])); + })->all(); $email_protocols = [ 'mail' => trans('settings.email.php'),