diff --git a/app/Domain/Notifications/VacationRequestCreatedNotification.php b/app/Domain/Notifications/VacationRequestCreatedNotification.php index 69198e7..d8f819e 100644 --- a/app/Domain/Notifications/VacationRequestCreatedNotification.php +++ b/app/Domain/Notifications/VacationRequestCreatedNotification.php @@ -92,7 +92,7 @@ class VacationRequestCreatedNotification extends Notification $name = $this->vacationRequest->name; if ($this->vacationRequest->creator()->is($this->vacationRequest->user)) { - return __("The vacation request :title for user :user has been created successfully.", [ + return __("The vacation request :title from user :user has been created successfully.", [ "user" => $this->vacationRequest->user->profile->full_name, "title" => $name, ]); diff --git a/app/Infrastructure/Http/Resources/UserFormDataResource.php b/app/Infrastructure/Http/Resources/UserFormDataResource.php index ff85794..83fd4e9 100644 --- a/app/Infrastructure/Http/Resources/UserFormDataResource.php +++ b/app/Infrastructure/Http/Resources/UserFormDataResource.php @@ -21,7 +21,7 @@ class UserFormDataResource extends JsonResource "position" => $this->profile->position, "employmentForm" => $this->profile->employment_form, "employmentDate" => $this->profile->employment_date->toDateString(), - "birthday" => $this->profile->birthday->toDateString(), + "birthday" => $this->profile->birthday?->toDateString(), "slackId" => $this->profile->slack_id, ]; }