Fix carbon dates on custom fields value (#178)

This commit is contained in:
mchev
2024-10-11 13:17:01 +02:00
committed by GitHub
parent dd98df1c77
commit 068f48568e

View File

@@ -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;