From 400d70ff7e9579655f6235f22589340d6a4a2147 Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Wed, 18 Mar 2026 16:30:27 +0100 Subject: [PATCH] use formatDate method --- app/Http/Controllers/TasksController.php | 2 ++ app/Mail/EventParticipationCancelledMail.php | 5 +++-- app/Mail/TaskParticipationCancelledMail.php | 3 +++ app/Mail/VolunteerAssignToTaskMail.php | 5 +++-- app/Mail/VolunteerUnassignToTaskMail.php | 5 +++-- resources/views/mails/eventParticipationCancelled.blade.php | 2 +- resources/views/mails/taskParticipationCancelled.blade.php | 2 +- resources/views/mails/volunteerAssignToTask.blade.php | 2 +- resources/views/mails/volunteerUnassignToTask.blade.php | 2 +- 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php index f57199c..74c06e6 100644 --- a/app/Http/Controllers/TasksController.php +++ b/app/Http/Controllers/TasksController.php @@ -158,6 +158,8 @@ class TasksController extends Controller 'name' => $user->name, 'lastname' => $user->lastname, 'taskName' => $task->name, + 'start' => $event->start, + 'end' => $task->end, ]; Mail::to($user->email)->send(new TaskParticipationCancelledMail($data)); } diff --git a/app/Mail/EventParticipationCancelledMail.php b/app/Mail/EventParticipationCancelledMail.php index 1255c67..bcb8e7a 100644 --- a/app/Mail/EventParticipationCancelledMail.php +++ b/app/Mail/EventParticipationCancelledMail.php @@ -2,6 +2,7 @@ namespace App\Mail; +use App\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -43,8 +44,8 @@ class EventParticipationCancelledMail extends Mailable 'name' => $this->data['name'], 'lastname' => $this->data['lastname'], 'eventName' => $this->data['eventName'], - 'start' => $this->data['start'], - 'end' => $this->data['end'], + 'start' => FormatDate::formatDate($this->data['start']), + 'end' => FormatDate::formatDate($this->data['end']), ] ); } diff --git a/app/Mail/TaskParticipationCancelledMail.php b/app/Mail/TaskParticipationCancelledMail.php index 9e59614..7eeacaf 100644 --- a/app/Mail/TaskParticipationCancelledMail.php +++ b/app/Mail/TaskParticipationCancelledMail.php @@ -2,6 +2,7 @@ namespace App\Mail; +use App\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -43,6 +44,8 @@ class TaskParticipationCancelledMail extends Mailable 'name' => $this->data['name'], 'lastname' => $this->data['lastname'], 'taskName' => $this->data['taskName'], + 'end' => FormatDate::formatDate($this->data['end']), + 'start' => FormatDate::formatDate($this->data['start']), ] ); } diff --git a/app/Mail/VolunteerAssignToTaskMail.php b/app/Mail/VolunteerAssignToTaskMail.php index a190c78..99c722b 100644 --- a/app/Mail/VolunteerAssignToTaskMail.php +++ b/app/Mail/VolunteerAssignToTaskMail.php @@ -2,6 +2,7 @@ namespace App\Mail; +use App\Services\FormatDate; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -43,8 +44,8 @@ class VolunteerAssignToTaskMail extends Mailable 'name' => $this->data['name'], 'lastname' => $this->data['lastname'], 'taskName' => $this->data['taskName'], - 'start' => $this->data['start'], - 'end' => $this->data['end'], + 'start' => FormatDate::formatDate($this->data['start']), + 'end' => FormatDate::formatDate($this->data['end']), ] ); } diff --git a/app/Mail/VolunteerUnassignToTaskMail.php b/app/Mail/VolunteerUnassignToTaskMail.php index 7af6317..506d0c3 100644 --- a/app/Mail/VolunteerUnassignToTaskMail.php +++ b/app/Mail/VolunteerUnassignToTaskMail.php @@ -8,6 +8,7 @@ use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; +use App\Services\FormatDate; class VolunteerUnassignToTaskMail extends Mailable { @@ -43,8 +44,8 @@ class VolunteerUnassignToTaskMail extends Mailable 'name' => $this->data['name'], 'lastname' => $this->data['lastname'], 'taskName' => $this->data['taskName'], - 'start' => $this->data['start'], - 'end' => $this->data['end'], + 'start' => FormatDate::formatDate($this->data['start']), + 'end' => FormatDate::formatDate($this->data['end']), ] ); } diff --git a/resources/views/mails/eventParticipationCancelled.blade.php b/resources/views/mails/eventParticipationCancelled.blade.php index 6a0d352..9d2a4c2 100644 --- a/resources/views/mails/eventParticipationCancelled.blade.php +++ b/resources/views/mails/eventParticipationCancelled.blade.php @@ -11,7 +11,7 @@

L’événement {{ $eventName }} a été supprimé par un administrateur. - Vous n’y participez donc plus. Cet événement avait lieu de {{ $start }} à {{ $end }}. + Vous n’y participez donc plus. Cet événement avait lieu du {{ $start }} au {{ $end }}.

diff --git a/resources/views/mails/taskParticipationCancelled.blade.php b/resources/views/mails/taskParticipationCancelled.blade.php index a6e287a..861520c 100644 --- a/resources/views/mails/taskParticipationCancelled.blade.php +++ b/resources/views/mails/taskParticipationCancelled.blade.php @@ -11,7 +11,7 @@

La tâche {{ $taskName }} a été supprimé par un administrateur. - Vous n’y participez donc plus. + Vous n’y participez donc plus. Cette tâche avait lieu du {{ $start }} au {{ $end }}.

diff --git a/resources/views/mails/volunteerAssignToTask.blade.php b/resources/views/mails/volunteerAssignToTask.blade.php index cfebaba..55c4057 100644 --- a/resources/views/mails/volunteerAssignToTask.blade.php +++ b/resources/views/mails/volunteerAssignToTask.blade.php @@ -11,7 +11,7 @@

Vous avez été assigné à la tâche {{ $taskName }} par un administrateur. - Cette tâche aura lieu de {{ $start }} à {{ $end }}. + Cette tâche aura lieu du {{ $start }} au {{ $end }}.

diff --git a/resources/views/mails/volunteerUnassignToTask.blade.php b/resources/views/mails/volunteerUnassignToTask.blade.php index d8f65dd..052c68e 100644 --- a/resources/views/mails/volunteerUnassignToTask.blade.php +++ b/resources/views/mails/volunteerUnassignToTask.blade.php @@ -11,7 +11,7 @@

Vous avez été désassigné de la tâche {{ $taskName }} par un administrateur. - Vous n'y participez donc plus. Cette tâche avait lieu de {{ $start }} à {{ $end }}. + Vous n'y participez donc plus. Cette tâche avait lieu du {{ $start }} au {{ $end }}.