update timezone
This commit is contained in:
parent
abbc810cf0
commit
e55a632fb9
|
|
@ -77,9 +77,9 @@ class TrackingController extends Controller
|
|||
'status' => 'required',
|
||||
]);
|
||||
$payload = $request->only(['name', 'time_string', 'status']);
|
||||
if($request->has('created_at')){
|
||||
$payload['created_at'] = Carbon::create($request->created_at)->setTimezone(env('TIME_ZONE'));
|
||||
}else{
|
||||
if ($request->has('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();
|
||||
|
|
@ -87,8 +87,8 @@ class TrackingController extends Controller
|
|||
if ($user) {
|
||||
$payload['user_id'] = $user->id;
|
||||
$latest = Tracking::where('name', $payload['name'])->whereDate('created_at', $date)->latest()->first();
|
||||
if($latest){
|
||||
if($payload['status'] == $this->CHECK_IN || $payload['status'] == $this->CHECK_OUT){
|
||||
if ($latest) {
|
||||
if ($payload['status'] == $this->CHECK_IN || $payload['status'] == $this->CHECK_OUT) {
|
||||
if ($latest->status == $this->CHECK_IN) {
|
||||
$payload['status'] = $this->CHECK_OUT;
|
||||
}
|
||||
|
|
@ -101,21 +101,20 @@ class TrackingController extends Controller
|
|||
'check_status' => $payload['status'],
|
||||
'status' => true
|
||||
]);
|
||||
}else{
|
||||
} else {
|
||||
return response()->json([
|
||||
'data' => "STATUS INVALID",
|
||||
'status' => false
|
||||
]);
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
$tracking = Tracking::create($payload);
|
||||
return response()->json([
|
||||
'data' => $tracking,
|
||||
'check_status' => $this->CHECK_IN,
|
||||
'status' => true
|
||||
]);
|
||||
return response()->json([
|
||||
'data' => $tracking,
|
||||
'check_status' => $this->CHECK_IN,
|
||||
'status' => true
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
|
|
@ -136,7 +135,11 @@ class TrackingController extends Controller
|
|||
|
||||
$tracking = Tracking::find($id);
|
||||
$payload = $request->all();
|
||||
|
||||
if ($request->has('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'));
|
||||
}
|
||||
if ($tracking) {
|
||||
$tracking->update($payload);
|
||||
}
|
||||
|
|
@ -187,5 +190,4 @@ class TrackingController extends Controller
|
|||
'status' => true
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue