From 068f48568e5e20edbd1811881362025a7fb2247d Mon Sep 17 00:00:00 2001
From: mchev <martin.chevignard@gmail.com>
Date: Fri, 11 Oct 2024 13:17:01 +0200
Subject: [PATCH] Fix carbon dates on custom fields value (#178)

---
 app/Http/Resources/CustomFieldValueResource.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/CustomFieldValueResource.php b/app/Http/Resources/CustomFieldValueResource.php
index 9f32c624..936a4fbb 100644
--- a/app/Http/Resources/CustomFieldValueResource.php
+++ b/app/Http/Resources/CustomFieldValueResource.php
@@ -3,6 +3,7 @@
 namespace App\Http\Resources;
 
 use App\Models\CompanySetting;
+use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CustomFieldValueResource extends JsonResource
@@ -48,11 +49,11 @@ class CustomFieldValueResource extends JsonResource
         }
 
         if ($key == 'date_time_answer') {
-            return $answer->format('Y-m-d H:i');
+            return Carbon::parse($answer)->format('Y-m-d H:i');
         }
 
         if ($key == 'date_answer') {
-            return $answer->format(CompanySetting::getSetting('carbon_date_format', $this->company_id));
+            return Carbon::parse($answer)->format(CompanySetting::getSetting('carbon_date_format', $this->company_id));
         }
 
         return $answer;