From eab3d062f545bc20da29d1fd85779997eaece0b0 Mon Sep 17 00:00:00 2001 From: James Collins Date: Sun, 16 Nov 2025 22:48:17 +1000 Subject: [PATCH] unsubscribe fixes --- app/Jobs/SendEmail.php | 15 --------------- .../views/vendor/mail/html/message.blade.php | 2 +- .../views/vendor/mail/text/message.blade.php | 2 +- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/Jobs/SendEmail.php b/app/Jobs/SendEmail.php index 914b7b2..f2139b9 100644 --- a/app/Jobs/SendEmail.php +++ b/app/Jobs/SendEmail.php @@ -58,23 +58,8 @@ class SendEmail implements ShouldQueue // Add unsubscribe link if mailable supports it if (method_exists($this->mailable, 'withUnsubscribeLink')) { - Log::info('SendEmail: Adding unsubscribe link', [ - 'job_id' => $this->job?->getJobId(), - 'recipient' => $this->to, - 'mailable' => get_class($this->mailable), - 'sentEmailId' => $sentEmail->id, - ]); - - $unsubscribeLink = route('unsubscribe', ['email' => $sentEmail->id]); $this->mailable->withUnsubscribeLink($unsubscribeLink); - } else { - Log::info('SendEmail: No unsubscribe link', [ - 'job_id' => $this->job?->getJobId(), - 'recipient' => $this->to, - 'mailable' => get_class($this->mailable), - 'sentEmailId' => $sentEmail->id, - ]); } Mail::to($this->to)->send($this->mailable); diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index 6d32550..c26d6dc 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -20,7 +20,7 @@

This email was sent to {{ $email }}
{{ config('app.name') }} | 63 Dalton Street | Westcourt, QLD 4870 Australia
© {{ date('Y') }} {{ config('app.name') }}. {{ __('All rights reserved.') }}
-Privacy Policy | Terms & Conditions @isset($unsubscribe) | Unsubscribe@endisset +Privacy Policy | Terms & Conditions @isset($unsubscribeLink) | Unsubscribe@endisset

diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php index 276cfef..0b9e501 100644 --- a/resources/views/vendor/mail/text/message.blade.php +++ b/resources/views/vendor/mail/text/message.blade.php @@ -18,7 +18,7 @@ This email was sent to {{ $email }} STEMMechanics | 63 Dalton Street | Westcourt, QLD 4870 Australia © {{ date('Y') }} {{ config('app.name') }}. {{ __('All rights reserved.') }} -@isset($unsubscribe) Unsubscribe: {{ $unsubscribe }}@endisset +@isset($unsubscribeLink) Unsubscribe: {{ $unsubscribeLink }}@endisset