From 67e9b7795a927fd702deb6b76876efe6ef832787 Mon Sep 17 00:00:00 2001 From: Nathan Butler Date: Wed, 29 Jun 2022 16:11:57 +1000 Subject: [PATCH 1/3] Added asset checkoutByTag API endpoint --- app/Http/Controllers/Api/AssetsController.php | 16 +++++++++++++++- routes/api.php | 7 +++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index d4e7a7a8b2..1f3a7a56d7 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -746,7 +746,21 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 200); } - + /** + * Checkout an asset by its tag. + * + * @author [N. Butler] + * @param string $tag + * @since [v6.0.5] + * @return JsonResponse + */ + public function checkoutByTag(AssetCheckoutRequest $request, $tag) + { + if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag', $tag)->first()) { + return $this->checkout($request, $asset->id); + } + return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); + } /** * Checkout an asset diff --git a/routes/api.php b/routes/api.php index 29af435687..faabaa28e4 100644 --- a/routes/api.php +++ b/routes/api.php @@ -441,6 +441,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi )->name('api.assets.show.bytag') ->where('any', '.*'); + Route::post('bytag/{any}/checkout', + [ + Api\AssetsController::class, + 'checkoutByTag' + ] + )->name('api.assets.checkout.bytag'); + Route::get('byserial/{any}', [ Api\AssetsController::class, From e28e7e37b8f8cb908719da445fef706101ba3995 Mon Sep 17 00:00:00 2001 From: Nathan Butler Date: Wed, 29 Jun 2022 17:49:50 +1000 Subject: [PATCH 2/3] Removed unneeded checks when searching for asset --- app/Http/Controllers/Api/AssetsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 1f3a7a56d7..ebb19159dd 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -756,7 +756,7 @@ class AssetsController extends Controller */ public function checkoutByTag(AssetCheckoutRequest $request, $tag) { - if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag', $tag)->first()) { + if ($asset = Asset::where('asset_tag', $tag)->first()) { return $this->checkout($request, $asset->id); } return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); From 6531657ee0f65ed087fe8cb3d6fc418a3662382f Mon Sep 17 00:00:00 2001 From: Nathan Butler Date: Wed, 29 Jun 2022 18:00:15 +1000 Subject: [PATCH 3/3] Revert version to dev for pull request --- config/version.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/version.php b/config/version.php index f5fc4bb380..fd17b0c4cc 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v6.0.5', - 'full_app_version' => 'v6.0.5 - build 8230-g393c32558', - 'build_version' => '8230', + 'full_app_version' => 'v6.0.5 - build 8229-g94e723a88', + 'build_version' => '8229', 'prerelease_version' => '', - 'hash_version' => 'g393c32558', - 'full_hash' => 'v6.0.5-102-g393c32558', - 'branch' => 'master', + 'hash_version' => 'g94e723a88', + 'full_hash' => 'v6.0.5-101-g94e723a88', + 'branch' => 'develop', ); \ No newline at end of file