From d45bd67cae267727690bc25f97a9526592a2e9f2 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 20 May 2025 09:51:02 -0700 Subject: [PATCH] added corrections --- app/Http/Controllers/AssetModelsController.php | 4 ++-- app/Http/Controllers/Assets/AssetsController.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index e99641d68a..0bbe19bdc6 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -82,7 +82,7 @@ class AssetModelsController extends Controller $model->notes = $request->input('notes'); $model->created_by = auth()->id(); $model->requestable = $request->has('requestable'); - $model->require_serial = $request->input('require_serial'); + $model->require_serial = $request->input('require_serial', 0); if ($request->input('fieldset_id') != '') { $model->fieldset_id = $request->input('fieldset_id'); @@ -143,7 +143,7 @@ class AssetModelsController extends Controller $model->category_id = $request->input('category_id'); $model->notes = $request->input('notes'); $model->requestable = $request->input('requestable', '0'); - $model->require_serial = $request->input('require_serial'); + $model->require_serial = $request->input('require_serial', 0); $model->fieldset_id = $request->input('fieldset_id'); if ($model->save()) { diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index da59fdb1a1..dd369f07b8 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -125,7 +125,7 @@ class AssetsController extends Controller $asset->name = $request->input('name'); //Validate required serial based on model setting - if ($model && $model->require_serial === 1 && empty($serials[$a] ?? null)) { + if ($model && $model->require_serial === 1 && empty($serials[$a])) { return redirect()->back() ->withInput() ->withErrors([ @@ -423,7 +423,7 @@ class AssetsController extends Controller session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]); //Validate required serial based on model setting - if ($model && $model->require_serial === 1 && empty($serial[1] ?? null)) { + if ($model && $model->require_serial === 1 && empty($serial[1])) { return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets')) ->with('warning', trans('admin/hardware/form.serial_required_post_model_update', [ 'asset_model' => $model->name