Skip to content

Commit

Permalink
more cleanup to fit formatting convention
Browse files Browse the repository at this point in the history
  • Loading branch information
adagioajanes committed Dec 20, 2021
1 parent 87ef37b commit 08cb8c3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
13 changes: 5 additions & 8 deletions app/Http/Controllers/Api/AssetsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -856,16 +856,13 @@ public function checkin(Request $request, $asset_id)
}

/**
* Bulk Checkin an asset
* This is the current solution to perform a bulk api checkin based on an asset tag, rather than a regular checkin.
* This is due to the need to find the asset first based on the asset tag.
* Checkin an asset by asset tag
*
* @author [A. Janes] [<[email protected]>]
* @param int $assetId
* @since [v4.0]
* @since [v6.0]
* @return JsonResponse
*/
public function bulkCheckin(Request $request)
public function checkinByTag(Request $request)
{
$this->authorize('checkin', Asset::class);
$asset = Asset::with('assetstatus')->where('asset_tag', $request->input('asset_tag'))->first();
Expand All @@ -875,8 +872,8 @@ public function bulkCheckin(Request $request)
}

return response()->json(Helper::formatStandardApiResponse('error', [
'asset'=> e($request->input('asset_tag'))
], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
'asset'=> e($request->input('asset'))
], 'Asset with tag '.e($request->input('asset')).' not found'));
}


Expand Down
2 changes: 1 addition & 1 deletion resources/views/hardware/quickscan-checkin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
var formData = $('#checkin-form').serializeArray();
$.ajax({
url: "{{ route('api.asset.bulkcheckin') }}",
url: "{{ route('api.asset.checkinbytag') }}",
type : 'POST',
headers: {
"X-Requested-With": 'XMLHttpRequest',
Expand Down
12 changes: 6 additions & 6 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -467,12 +467,12 @@
]
)->name('api.asset.checkin');

Route::post('bulkcheckin',
[
Api\AssetsController::class,
'bulkcheckin'
]
)->name('api.asset.bulkcheckin');
Route::post('checkinbytag',
[
Api\AssetsController::class,
'checkinbytag'
]
)->name('api.asset.checkinbytag');

Route::post('checkout',
[
Expand Down

0 comments on commit 08cb8c3

Please sign in to comment.