Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/Api/AssetsController.php

@@ -885,11 +885,9 @@ class AssetsController extends Controller
         if ($request->has('status_id')) {
             $asset->status_id = $request->input('status_id');
         }
+        
+        $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '. date('H:i:s') : date('Y-m-d H:i:s');
 
-        $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'), $checkin_at));
@@ -912,7 +910,7 @@ class AssetsController extends Controller
         $this->authorize('checkin', Asset::class);
         $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();
 
-        if($asset) {
+        if ($asset) {
             return $this->checkin($request, $asset->id);
         }
 

composer.json

@@ -27,13 +27,12 @@
     "arietimmerman/laravel-scim-server": "dev-master",
     "bacon/bacon-qr-code": "^2.0",
     "barryvdh/laravel-debugbar": "^3.6",
-    "barryvdh/laravel-dompdf": "^1.0",
+    "barryvdh/laravel-dompdf": "^2.0",
     "doctrine/cache": "^1.10",
     "doctrine/common": "^2.12",
     "doctrine/dbal": "^3.1",
     "doctrine/inflector": "^1.3",
     "doctrine/instantiator": "^1.3",
-    "dompdf/dompdf": "^1.2",
     "eduardokum/laravel-mail-auto-embed": "^1.0",
     "enshrined/svg-sanitize": "^0.15.0",
     "erusev/parsedown": "^1.7",
@@ -127,4 +126,4 @@
     "discard-changes": true,
     "process-timeout": 3000
   }
-}
+}