Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api…

…-date Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API
snipe · Feb 10, 2022 · 70af10a · 70af10a
2 parents 9892e5b + 3536d08
commit 70af10a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
@@ -860,8 +860,13 @@ public function checkin(Request $request, $asset_id)
             $asset->status_id =  $request->input('status_id');
         }
 
+        $checkin_at = null;
+        if ($request->filled('checkin_at')) {
+            $checkin_at = $request->input('checkin_at');
+        }
+
         if ($asset->save()) {
-            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note')));
+            event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at));
 
             return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success')));
         }