Merge remote-tracking branch 'origin/develop'

snipe · Dec 15, 2023 · ea8181d · ea8181d
2 parents ec3c467 + 05bc9f1
commit ea8181d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckinController.php b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -60,9 +60,10 @@ public function store(Request $request, $accessoryUserId = null, $backto = null)
 
         $this->authorize('checkin', $accessory);
 
-        $checkin_at = date('Y-m-d');
+        $checkin_hours = date('H:i:s');
+        $checkin_at = date('Y-m-d H:i:s');
         if ($request->filled('checkin_at')) {
-            $checkin_at = $request->input('checkin_at');
+            $checkin_at = $request->input('checkin_at').' '.$checkin_hours;
         }
 
         // Was the accessory updated?