diff --git a/app/Http/Controllers/Admin/ContentController.php b/app/Http/Controllers/Admin/ContentController.php index 91f48d8..063c183 100644 --- a/app/Http/Controllers/Admin/ContentController.php +++ b/app/Http/Controllers/Admin/ContentController.php @@ -118,8 +118,10 @@ class ContentController extends Controller Setting::flushCache(); - return redirect()->route('admin.content.index') - ->with('success', 'Layout en teksten zijn direct opgeslagen en live bijgewerkt in de webshop!'); + $tab = $request->input('active_tab'); + $redirect = $tab ? redirect()->route('admin.content.index', ['tab' => $tab]) : redirect()->route('admin.content.index'); + + return $redirect->with('success', 'Layout en teksten zijn direct opgeslagen en live bijgewerkt in de webshop!'); } /** @@ -164,24 +166,26 @@ class ContentController extends Controller $recipient = $validated['test_email']; $defaultMailer = config('mail.default'); $fromAddress = config('mail.from.address'); + $smtpHost = config('mail.mailers.smtp.host'); + $smtpPort = config('mail.mailers.smtp.port'); try { - Mail::raw("Dit is een test e-mail vanaf Jouwdriedee.nl om de e-mail bezorging naar {$recipient} te controleren.\n\nActieve mailer: {$defaultMailer}\nAfzender: {$fromAddress}\nDatum: ".now()->format('d-m-Y H:i:s'), function ($message) use ($recipient) { + Mail::raw("Dit is een test e-mail vanaf Jouwdriedee.nl om de e-mail bezorging naar {$recipient} te controleren.\n\nActieve mailer: {$defaultMailer}\nSMTP Server: {$smtpHost}:{$smtpPort}\nAfzender: {$fromAddress}\nDatum: ".now()->format('d-m-Y H:i:s'), function ($message) use ($recipient) { $message->to($recipient) ->subject('Test E-mail vanaf Jouwdriedee.nl'); }); if ($defaultMailer === 'log') { - return redirect()->back() + return redirect()->route('admin.content.index', ['tab' => 'email']) ->with('warning', "De testmail is weggeschreven naar de serverlogs (MAIL_MAILER staat op 'log'). Er is GEEN echte e-mail naar {$recipient} verzonden. Stel op Coolify geldige SMTP-gegevens in (bijv. Brevo, Resend of je hosting SMTP) om echte e-mails te bezorgen."); } - return redirect()->back() - ->with('success', "Test e-mail succesvol verzonden via driver '{$defaultMailer}' naar {$recipient}! Controleer je inbox en eventueel je spambox."); + return redirect()->route('admin.content.index', ['tab' => 'email']) + ->with('success', "Test e-mail succesvol overhandigd aan de SMTP-server ({$smtpHost}:{$smtpPort}) voor {$recipient}! Controleer je inbox en eventueel je spamfolder."); } catch (\Throwable $e) { Log::error('Test mail error: '.$e->getMessage(), ['trace' => $e->getTraceAsString()]); - return redirect()->back() + return redirect()->route('admin.content.index', ['tab' => 'email']) ->with('error', "Fout bij verzenden van e-mail via {$defaultMailer}: ".$e->getMessage()); } } @@ -198,7 +202,7 @@ class ContentController extends Controller $statusText = $new ? 'OFFLINE gezet' : 'weer ONLINE gezet'; - return redirect()->back() + return redirect()->route('admin.content.index', ['tab' => 'offline']) ->with('success', "De webshop is direct {$statusText}!"); } } diff --git a/config/mail.php b/config/mail.php index 42b6eaf..5b7eb59 100644 --- a/config/mail.php +++ b/config/mail.php @@ -43,6 +43,7 @@ return [ 'url' => env('MAIL_URL'), 'host' => env('MAIL_HOST', '127.0.0.1'), 'port' => env('MAIL_PORT', 2525), + 'encryption' => env('MAIL_ENCRYPTION'), 'username' => env('MAIL_USERNAME'), 'password' => env('MAIL_PASSWORD'), 'timeout' => null, diff --git a/resources/views/admin/communications/index.blade.php b/resources/views/admin/communications/index.blade.php index e9a09ab..4d2dbda 100644 --- a/resources/views/admin/communications/index.blade.php +++ b/resources/views/admin/communications/index.blade.php @@ -220,3 +220,4 @@ @endsection + diff --git a/resources/views/admin/communications/show.blade.php b/resources/views/admin/communications/show.blade.php index 9f986b4..715126f 100644 --- a/resources/views/admin/communications/show.blade.php +++ b/resources/views/admin/communications/show.blade.php @@ -280,3 +280,4 @@ @endsection + diff --git a/resources/views/admin/content/index.blade.php b/resources/views/admin/content/index.blade.php index 60ed561..9e189e1 100644 --- a/resources/views/admin/content/index.blade.php +++ b/resources/views/admin/content/index.blade.php @@ -3,7 +3,29 @@ @section('title', 'Layout & Teksten Aanpassen | Jouwdriedee Beheer') @section('content') -
+
@@ -32,12 +54,13 @@
@csrf +