diff --git a/app/Exceptions/ModelStillHasAccessories.php b/app/Exceptions/ModelStillHasAccessories.php index f11f06dac4..38e67181f1 100644 --- a/app/Exceptions/ModelStillHasAccessories.php +++ b/app/Exceptions/ModelStillHasAccessories.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasAccessories extends Exception +class ModelStillHasAccessories extends ModelStillHasChildren { // } diff --git a/app/Exceptions/ModelStillHasAssetMaintenances.php b/app/Exceptions/ModelStillHasAssetMaintenances.php index e42b0fde1a..d9ecb319a7 100644 --- a/app/Exceptions/ModelStillHasAssetMaintenances.php +++ b/app/Exceptions/ModelStillHasAssetMaintenances.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasAssetMaintenances extends Exception +class ModelStillHasAssetMaintenances extends ModelStillHasChildren { // } diff --git a/app/Exceptions/ModelStillHasAssetModels.php b/app/Exceptions/ModelStillHasAssetModels.php index 7e68c3ac5e..eeebd0225e 100644 --- a/app/Exceptions/ModelStillHasAssetModels.php +++ b/app/Exceptions/ModelStillHasAssetModels.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasAssetModels extends Exception +class ModelStillHasAssetModels extends ModelStillHasChildren { // } diff --git a/app/Exceptions/ModelStillHasComponents.php b/app/Exceptions/ModelStillHasComponents.php index 926c7cea4d..6acafab206 100644 --- a/app/Exceptions/ModelStillHasComponents.php +++ b/app/Exceptions/ModelStillHasComponents.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasComponents extends Exception +class ModelStillHasComponents extends ModelStillHasChildren { // } diff --git a/app/Exceptions/ModelStillHasConsumables.php b/app/Exceptions/ModelStillHasConsumables.php index 9839d58d79..14cee58af4 100644 --- a/app/Exceptions/ModelStillHasConsumables.php +++ b/app/Exceptions/ModelStillHasConsumables.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasConsumables extends Exception +class ModelStillHasConsumables extends ModelStillHasChildren { // } diff --git a/app/Exceptions/ModelStillHasLicenses.php b/app/Exceptions/ModelStillHasLicenses.php index 3b383ca387..cdc561c69f 100644 --- a/app/Exceptions/ModelStillHasLicenses.php +++ b/app/Exceptions/ModelStillHasLicenses.php @@ -4,7 +4,7 @@ namespace App\Exceptions; use Exception; -class ModelStillHasLicenses extends Exception +class ModelStillHasLicenses extends ModelStillHasChildren { // } diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index cfa32f1888..07294f3e94 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -7,6 +7,7 @@ use App\Exceptions\ModelIsNotDeletable; use App\Exceptions\ModelStillHasAccessories; use App\Exceptions\ModelStillHasAssetModels; use App\Exceptions\ModelStillHasAssets; +use App\Exceptions\ModelStillHasChildren; use App\Exceptions\ModelStillHasComponents; use App\Exceptions\ModelStillHasConsumables; use App\Exceptions\ModelStillHasLicenses; @@ -223,7 +224,7 @@ class CategoriesController extends Controller $this->authorize('delete', Category::class); try { DestroyCategoryAction::run(category: $category); - } catch (ModelStillHasConsumables|ModelStillHasAccessories|ModelStillHasAssetModels|ModelStillHasAssets|ModelStillHasComponents|ModelStillHasLicenses $e) { + } catch (ModelStillHasChildren $e) { return response()->json( Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type' => $category->category_type])) ); diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index 1c3d06f358..95e68e807b 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api; use App\Actions\Suppliers\DestroySupplierAction; use App\Exceptions\ModelStillHasAssetMaintenances; use App\Exceptions\ModelStillHasAssets; +use App\Exceptions\ModelStillHasChildren; use App\Exceptions\ModelStillHasLicenses; use App\Helpers\Helper; use App\Http\Controllers\Controller; @@ -200,12 +201,8 @@ class SuppliersController extends Controller $this->authorize('delete', $supplier); try { DestroySupplierAction::run(supplier: $supplier); - } catch (ModelStillHasAssets $e) { + } catch (ModelStillHasChildren $e) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]))); - } catch (ModelStillHasAssetMaintenances $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]))); - } catch (ModelStillHasLicenses $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]))); } catch (\Throwable $e) { return response()->json(Helper::formatStandardApiResponse('error', null, 'something went wrong')); } diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index cdc8c81f05..b934b3c33e 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -6,6 +6,7 @@ use App\Actions\Categories\DestroyCategoryAction; use App\Exceptions\ModelStillHasAccessories; use App\Exceptions\ModelStillHasAssetModels; use App\Exceptions\ModelStillHasAssets; +use App\Exceptions\ModelStillHasChildren; use App\Exceptions\ModelStillHasComponents; use App\Exceptions\ModelStillHasConsumables; use App\Exceptions\ModelStillHasLicenses; @@ -153,7 +154,7 @@ class CategoriesController extends Controller $this->authorize('delete', Category::class); try { DestroyCategoryAction::run($category); - } catch (ModelStillHasAssets|ModelStillHasAccessories|ModelStillHasAssetModels|ModelStillHasComponents|ModelStillHasConsumables|ModelStillHasLicenses $e) { + } catch (ModelStillHasChildren $e) { return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type' => $category->category_type])); } catch (\Exception $e) { report($e); diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index e6671808ce..f4a4b25912 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Actions\Suppliers\DestroySupplierAction; use App\Exceptions\ModelStillHasAssetMaintenances; use App\Exceptions\ModelStillHasAssets; +use App\Exceptions\ModelStillHasChildren; use App\Exceptions\ModelStillHasLicenses; use App\Http\Requests\ImageUploadRequest; use App\Models\Supplier; @@ -128,12 +129,8 @@ class SuppliersController extends Controller $this->authorize('delete', Supplier::class); try { DestroySupplierAction::run(supplier: $supplier); - } catch (ModelStillHasAssets $e) { + } catch (ModelStillHasChildren $e) { return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])); - } catch (ModelStillHasAssetMaintenances $e) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])); - } catch (ModelStillHasLicenses $e) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])); } catch (\Throwable $e) { report($e); return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.error'));