Compare commits
	
		
			No commits in common. "b52537cfe446628664843649059182f774ca1ab8" and "ee281986b8b50dec12777818ff4626f578c79622" have entirely different histories.
		
	
	
		
			b52537cfe4
			...
			ee281986b8
		
	
		| 
						 | 
				
			
			@ -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(13, 0, 0);
 | 
			
		||||
                    $start = $date->copy()->setTime(11, 30, 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(env('TIME_ZONE'))
 | 
			
		||||
                        'created_at' => $start->setTimezone('UTC')
 | 
			
		||||
                    ],
 | 
			
		||||
                    [
 | 
			
		||||
                        'name' => $user->name,
 | 
			
		||||
                        'user_id' => $user->id,
 | 
			
		||||
                        'status' => 'check out',
 | 
			
		||||
                        'time_string' => $end->format('Y-m-d H:i:s'),
 | 
			
		||||
                        'created_at' => $end->setTimezone(env('TIME_ZONE'))
 | 
			
		||||
                        'created_at' => $end->setTimezone('UTC')
 | 
			
		||||
                    ]
 | 
			
		||||
                ]);
 | 
			
		||||
                //WFH - end tracking
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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(env('TIME_ZONE'))
 | 
			
		||||
                    'created_at' => $start->setTimezone('UTC')
 | 
			
		||||
                ],
 | 
			
		||||
                [
 | 
			
		||||
                    'name' => $user->name,
 | 
			
		||||
                    'user_id' => $user->id,
 | 
			
		||||
                    'status' => 'check out',
 | 
			
		||||
                    'time_string' => $end->format('Y-m-d H:i:s'),
 | 
			
		||||
                    'created_at' => $end->setTimezone(env('TIME_ZONE'))
 | 
			
		||||
                    'created_at' => $end->setTimezone('UTC')
 | 
			
		||||
                ]
 | 
			
		||||
            ]);
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue