QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-20 19:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix carbon dates on custom fields value (#178)

Browse Source
This commit is contained in:
mchev
2024-10-11 13:17:01 +02:00
committed by GitHub
parent dd98df1c77
commit 068f48568e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Resources/CustomFieldValueResource.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Resources; namespace App\Http\Resources;
use App\Models\CompanySetting; use App\Models\CompanySetting;
use Carbon\Carbon;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
class CustomFieldValueResource extends JsonResource class CustomFieldValueResource extends JsonResource
@@ -48,11 +49,11 @@ class CustomFieldValueResource extends JsonResource
} }
if ($key == 'date_time_answer') { 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') { 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; return $answer;