From 643d44af22e14a6b778daa52b5fd0fba9fdbf4f2 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 20 Aug 2025 23:09:59 -0500 Subject: [PATCH] change \Throwable to \Exceptionm, add missing `report()`s --- app/Http/Controllers/Api/CategoriesController.php | 2 +- app/Http/Controllers/Api/ManufacturersController.php | 1 + app/Http/Controllers/Api/SuppliersController.php | 1 + app/Http/Controllers/ManufacturersController.php | 9 +-------- app/Http/Controllers/SuppliersController.php | 2 +- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index cb6f2529ad..d7cde6d1e1 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -220,7 +220,7 @@ class CategoriesController extends Controller return response()->json( Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type' => $category->category_type])) ); - } catch (\Throwable $e) { + } catch (\Exception $e) { report($e); return response()->json( Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong')) diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index c26c360f5d..5400fa145d 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -199,6 +199,7 @@ class ManufacturersController extends Controller } catch (ItemStillHasChildren $e) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users'))); } catch (\Exception $e) { + report($e); return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))); } diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index 5d0b15f874..22421b6c48 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -207,6 +207,7 @@ class SuppliersController extends Controller } catch (ItemStillHasLicenses $e) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]))); } catch (\Exception $e) { + report($e); return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))); } diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index dbf29c543f..900a2c5a28 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -173,17 +173,10 @@ class ManufacturersController extends Controller } catch (ItemStillHasChildren $e) { return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users')); } catch (\Exception $e) { + report($e); return redirect()->route('manufacturers.index')->with('error', trans('general.something_went_wrong')); } - // Soft delete the manufacturer if active, permanent delete if is already deleted - // do we really want to do that?... - // commenting it out for now because it's weird... - //if ($manufacturer->deleted_at === null) { - // $manufacturer->delete(); - //} else { - // $manufacturer->forceDelete(); - //} return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success')); } diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index 34ee3b0e0d..38e018e502 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -135,7 +135,7 @@ class SuppliersController extends Controller $errors->add('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])); } catch (ItemStillHasLicenses $e) { $errors->add('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])); - } catch (\Throwable $e) { + } catch (\Exception $e) { report($e); $errors->add('error', trans('general.something_went_wrong')); }