Merge branch 'main' into #39-generate-timesheet

2022-02-21 15:02:17 +01:00
parent 9ada0f843d 77a4d5711c
commit fbdffabbea
28 changed files with 1116 additions and 26 deletions
--- a/app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
+++ b/app/Infrastructure/Http/Resources/VacationRequestActivityResource.php
@@ -13,7 +13,7 @@ class VacationRequestActivityResource extends JsonResource
    public function toArray($request): array
    {
        return [
-            "date" => $this->created_at->format("d.m.Y"),
+            "date" => $this->created_at->toDisplayDate(),
            "time" => $this->created_at->format("H:i"),
            "user" => $this->user ? $this->user->fullName : __("System"),
            "state" => $this->to,