DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-31 07:30:46 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-07-22 19:06:28 -07:00
parent 3c22e0d203 dc06f14505
commit 658edb64d6
3 changed files with 464 additions and 514 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Api/AssetsController.php
View file

@ -886,10 +886,8 @@ class AssetsController extends Controller
$asset->status_id = $request->input('status_id'); $asset->status_id = $request->input('status_id');
} }
$checkin_at = null; $checkin_at = $request->filled('checkin_at') ? $request->input('checkin_at').' '. date('H:i:s') : date('Y-m-d H:i:s');
if ($request->filled('checkin_at')) {
$checkin_at = $request->input('checkin_at');
}
if ($asset->save()) { if ($asset->save()) {
event(new CheckoutableCheckedIn($asset, $target, Auth::user(), $request->input('note'), $checkin_at)); 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); $this->authorize('checkin', Asset::class);
$asset = Asset::where('asset_tag', $request->input('asset_tag'))->first(); $asset = Asset::where('asset_tag', $request->input('asset_tag'))->first();
if($asset) { if ($asset) {
return $this->checkin($request, $asset->id); return $this->checkin($request, $asset->id);
} }

3
composer.json
View file

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

965
composer.lock generated
View file

File diff suppressed because it is too large Load diff