diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 24152670ee..79e55befb9 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -885,13 +885,17 @@ class AssetsController extends Controller public function checkin(Request $request, $asset_id) { $this->authorize('checkin', Asset::class); - $asset = Asset::findOrFail($asset_id); + $asset = Asset::with('model')->findOrFail($asset_id); $this->authorize('checkin', $asset); $target = $asset->assignedTo; if (is_null($target)) { - return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.already_checked_in'))); + return response()->json(Helper::formatStandardApiResponse('error', [ + 'asset_tag'=> e($asset->asset_tag), + 'model' => e($asset->model->name), + 'model_number' => e($asset->model->model_number) + ], trans('admin/hardware/message.checkin.already_checked_in'))); } $asset->expected_checkin = null; @@ -925,7 +929,11 @@ class AssetsController extends Controller if ($asset->save()) { event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at, $originalValues)); - return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.success'))); + return response()->json(Helper::formatStandardApiResponse('success', [ + 'asset_tag'=> e($asset->asset_tag), + 'model' => e($asset->model->name), + 'model_number' => e($asset->model->model_number) + ], trans('admin/hardware/message.checkin.success'))); } return response()->json(Helper::formatStandardApiResponse('error', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error'))); diff --git a/public/css/build/app.css b/public/css/build/app.css index 86bf09ccd5..39ca7c10c6 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index b2b64c0b56..3a0b1c80ce 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 248fa85f3a..b1259e2f2b 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 3fbbb10fe3..699813122b 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=72071a8a4dc754c61b0440d3c4119cbf", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091", - "/css/build/overrides.css": "/css/build/overrides.css?id=1b392b587d6d9c6c3208cee77dd50c24", - "/css/build/app.css": "/css/build/app.css?id=def81f26a041542b7831129c1935678b", + "/css/build/overrides.css": "/css/build/overrides.css?id=c8c36239d8ef77849c8c42c7edcb9d2e", + "/css/build/app.css": "/css/build/app.css?id=63bae107587455323cedd08aff2e387d", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=268041e902b019730c23ee3875838005", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=d409d9b1a3b69247df8b98941ba06e33", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb", - "/css/dist/all.css": "/css/dist/all.css?id=ae9bfb0457654b249e68a445ebad6409", + "/css/dist/all.css": "/css/dist/all.css?id=76de0dc7f2e51d5ea594f0c21c296790", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=a656b2d865fe379d8851757e8e4001ef", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index af922fc080..128817a119 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -399,7 +399,7 @@ img.navbar-brand-img, .navbar-brand>img { } .icon-med { - font-size: 20px; + font-size: 14px; color: #889195; } diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index 677e0c0f15..5ab273bffd 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -81,6 +81,8 @@ {{ trans('general.asset_tag') }} + {{ trans('general.asset_model') }} + {{ trans('general.model_no') }} {{ trans('general.quickscan_checkin_status') }} @@ -126,7 +128,7 @@ data : formData, success : function (data) { if (data.status == 'success') { - $('#checkedin tbody').prepend("" + data.payload.asset + "" + data.messages + ""); + $('#checkedin tbody').prepend("" + data.payload.asset_tag + "" + data.payload.model + "" + data.payload.model_number + "" + data.messages + ""); incrementOnSuccess(); } else { handlecheckinFail(data); @@ -146,17 +148,21 @@ }); function handlecheckinFail (data) { - if (data.payload.asset) { - var asset = data.payload.asset; + if (data.payload.asset_tag) { + var asset_tag = data.payload.asset_tag; + var model = data.payload.model; + var model_number = data.payload.model_number; } else { - var asset = ''; + var asset_tag = ''; + var model = ''; + var model_number = ''; } if (data.messages) { var messages = data.messages; } else { var messages = ''; } - $('#checkedin tbody').prepend("" + asset + "" + messages + ""); + $('#checkedin tbody').prepend("" + asset_tag + "" + model + "" + model_number + "" + messages + ""); } function incrementOnSuccess() { diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index 67c1976541..2a939156a3 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -40,7 +40,8 @@ data-id-table="system-backups" data-search="true" data-side-pagination="client" - data-sort-order="asc" + data-sort-order="desc" + data-sort-name="modified_display" id="system-backups" class="table table-striped snipe-table">