From abbc810cf01dff58d7db96386cce8dfd976941c2 Mon Sep 17 00:00:00 2001 From: JOSEPH LE Date: Thu, 20 Jun 2024 09:16:04 +0700 Subject: [PATCH] update timezone --- .../Modules/Admin/app/Http/Controllers/TrackingController.php | 4 +++- BACKEND/config/app.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php index 8d390f7..7b60860 100755 --- a/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php +++ b/BACKEND/Modules/Admin/app/Http/Controllers/TrackingController.php @@ -78,7 +78,9 @@ class TrackingController extends Controller ]); $payload = $request->only(['name', 'time_string', 'status']); if($request->has('created_at')){ - $payload['created_at'] = $request->created_at; + $payload['created_at'] = Carbon::create($request->created_at)->setTimezone(env('TIME_ZONE')); + }else{ + $payload['created_at'] = Carbon::create(new DateTime())->setTimezone(env('TIME_ZONE')); } $user = Admin::where('name', $payload['name'])->first(); $date = Carbon::create(new DateTime())->setTimezone(env('TIME_ZONE'))->format('Y-m-d'); diff --git a/BACKEND/config/app.php b/BACKEND/config/app.php index d43b94e..eae73f8 100755 --- a/BACKEND/config/app.php +++ b/BACKEND/config/app.php @@ -70,7 +70,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => env('TIME_ZONE', 'UTC'), /* |--------------------------------------------------------------------------