diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php index 2df8e81..6488e7a 100644 --- a/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php +++ b/BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php @@ -1125,7 +1125,7 @@ class TicketController extends Controller if ($type == 'S') { $end = $date->copy()->setTime(11, 30, 0); } else if ($type == 'C') { - $start = $date->copy()->setTime(11, 30, 0); + $start = $date->copy()->setTime(13, 0, 0); } Tracking::insert([ @@ -1134,14 +1134,14 @@ class TicketController extends Controller 'user_id' => $user->id, 'status' => 'check in', 'time_string' => $start->format('Y-m-d H:i:s'), - 'created_at' => $start->setTimezone('UTC') + 'created_at' => $start->setTimezone(env('TIME_ZONE')) ], [ 'name' => $user->name, 'user_id' => $user->id, 'status' => 'check out', 'time_string' => $end->format('Y-m-d H:i:s'), - 'created_at' => $end->setTimezone('UTC') + 'created_at' => $end->setTimezone(env('TIME_ZONE')) ] ]); //WFH - end tracking diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/TimekeepingController.php b/BACKEND/Modules/Admin/app/Http/Controllers/TimekeepingController.php index 03a6b99..2d20aee 100644 --- a/BACKEND/Modules/Admin/app/Http/Controllers/TimekeepingController.php +++ b/BACKEND/Modules/Admin/app/Http/Controllers/TimekeepingController.php @@ -78,14 +78,14 @@ class TimekeepingController extends Controller 'user_id' => $user->id, 'status' => 'check in', 'time_string' => $start->format('Y-m-d H:i:s'), - 'created_at' => $start->setTimezone('UTC') + 'created_at' => $start->setTimezone(env('TIME_ZONE')) ], [ 'name' => $user->name, 'user_id' => $user->id, 'status' => 'check out', 'time_string' => $end->format('Y-m-d H:i:s'), - 'created_at' => $end->setTimezone('UTC') + 'created_at' => $end->setTimezone(env('TIME_ZONE')) ] ]); }