diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index d7cde6d1e1..3b1fc91e12 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -218,7 +218,7 @@ class CategoriesController extends Controller DestroyCategoryAction::run(category: $category); } catch (ItemStillHasChildren $e) { return response()->json( - Helper::formatStandardApiResponse('error', null, trans('admin/categories/message.assoc_items', ['asset_type' => $category->category_type])) + Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['asset_type' => $category->category_type])) ); } catch (\Exception $e) { report($e); diff --git a/app/Http/Controllers/Api/ManufacturersController.php b/app/Http/Controllers/Api/ManufacturersController.php index 5400fa145d..b714675b75 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -197,7 +197,7 @@ class ManufacturersController extends Controller try { DeleteManufacturerAction::run($manufacturer); } catch (ItemStillHasChildren $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users'))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')]))); } 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 22421b6c48..304a70094a 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -201,11 +201,17 @@ class SuppliersController extends Controller try { DestroySupplierAction::run(supplier: $supplier); } catch (ItemStillHasAssets $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_assets', [ + 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier') + ]))); } catch (ItemStillHasMaintenances $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_maintenances', [ + 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier') + ]))); } catch (ItemStillHasLicenses $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count]))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.bulk_delete_associations.assoc_licenses', [ + 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier') + ]))); } catch (\Exception $e) { report($e); return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))); diff --git a/app/Http/Controllers/BulkCategoriesController.php b/app/Http/Controllers/BulkCategoriesController.php index f1298c8a22..84fb3bcb58 100644 --- a/app/Http/Controllers/BulkCategoriesController.php +++ b/app/Http/Controllers/BulkCategoriesController.php @@ -28,17 +28,17 @@ class BulkCategoriesController extends Controller try { DestroyCategoryAction::run(category: $category); } catch (ItemStillHasAccessories $e) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_accessories', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]); } catch (ItemStillHasAssetModels) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_models', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_asset_models_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]); } catch (ItemStillHasAssets) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_assets', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]); } catch (ItemStillHasComponents) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_components', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]); } catch (ItemStillHasConsumables) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_consumables', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]); } catch (ItemStillHasLicenses) { - $errors[] = trans('admin/categories/message.delete.bulk_assoc_licenses', ['category_name' => $category->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['item_name' => $category->name, 'item' => trans('general.category')]);; } catch (\Exception $e) { report($e); $errors[] = trans('general.something_went_wrong'); diff --git a/app/Http/Controllers/BulkManufacturersController.php b/app/Http/Controllers/BulkManufacturersController.php index f497766e5c..5c6454af32 100644 --- a/app/Http/Controllers/BulkManufacturersController.php +++ b/app/Http/Controllers/BulkManufacturersController.php @@ -29,15 +29,15 @@ class BulkManufacturersController extends Controller try { DeleteManufacturerAction::run(manufacturer: $manufacturer); } catch (ItemStillHasAssets $e) { - $errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_assets', ['manufacturer_name' => $manufacturer->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_assets_no_count', ['manufacturer_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]); } catch (ItemStillHasAccessories $e) { - $errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_accessories', ['manufacturer_name' => $manufacturer->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_accessories_no_count', ['manufacturer_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]); } catch (ItemStillHasConsumables $e) { - $errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_consumables', ['manufacturer_name' => $manufacturer->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_consumables_no_count', ['manufacturer_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]); } catch (ItemStillHasComponents $e) { - $errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_components', ['manufacturer_name' => $manufacturer->name]);; + $errors[] = trans('general.bulk_delete_associations.assoc_components_no_count', ['manufacturer_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]); } catch (ItemStillHasLicenses $e) { - $errors[] = trans('admin/manufacturers/message.delete.bulk_assoc_licenses', ['manufacturer_name' => $manufacturer->name]);; + $errors[] = trans('general.bulk_delete_associations.assoc_licenses_no_count', ['manufacturer_name' => $manufacturer->name, 'item' => trans('general.manufacturer')]);; } catch (\Exception $e) { report($e); $errors[] = trans('general.something_went_wrong'); diff --git a/app/Http/Controllers/BulkSuppliersController.php b/app/Http/Controllers/BulkSuppliersController.php index c4df351075..0abb0fd8ea 100644 --- a/app/Http/Controllers/BulkSuppliersController.php +++ b/app/Http/Controllers/BulkSuppliersController.php @@ -25,11 +25,11 @@ class BulkSuppliersController extends Controller try { DestroySupplierAction::run(supplier: $supplier); } catch (ItemStillHasAssets $e) { - $errors[] = trans('admin/suppliers/message.delete.bulk_assoc_assets', ['supplier_name' => $supplier->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_assets', ['asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier')]); } catch (ItemStillHasMaintenances $e) { - $errors[] = trans('admin/suppliers/message.delete.bulk_assoc_maintenances', ['supplier_name' => $supplier->name]);; + $errors[] = trans('general.bulk_delete_associations.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier')]); } catch (ItemStillHasLicenses $e) { - $errors[] = trans('admin/suppliers/message.delete.bulk_assoc_licenses', ['supplier_name' => $supplier->name]); + $errors[] = trans('general.bulk_delete_associations.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier')]); } catch (\Exception $e) { report($e); $errors[] = trans('general.something_went_wrong'); diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index aa75f83d15..600d99d6b6 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -157,7 +157,7 @@ class CategoriesController extends Controller try { DestroyCategoryAction::run($category); } catch (ItemStillHasChildren $e) { - return redirect()->route('categories.index')->with('error', trans('admin/categories/message.assoc_items', ['asset_type' => $category->category_type])); + return redirect()->route('categories.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.category')])); } catch (\Exception $e) { report($e); return redirect()->route('categories.index')->with('error', trans('admin/categories/message.delete.error')); diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index 900a2c5a28..d996855a5e 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -171,7 +171,7 @@ class ManufacturersController extends Controller try { DeleteManufacturerAction::run($manufacturer); } catch (ItemStillHasChildren $e) { - return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users')); + return redirect()->route('manufacturers.index')->with('error', trans('general.bulk_delete_associations.general_assoc_warning', ['item' => trans('general.manufacturer')])); } catch (\Exception $e) { report($e); return redirect()->route('manufacturers.index')->with('error', trans('general.something_went_wrong')); diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index 75fe772c56..681eb835d7 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -129,11 +129,17 @@ class SuppliersController extends Controller try { DestroySupplierAction::run(supplier: $supplier); } catch (ItemStillHasAssets $e) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])); + return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_assets', [ + 'asset_count' => (int) $supplier->assets_count, 'item' => trans('general.supplier') + ])); } catch (ItemStillHasMaintenances $e) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])); + return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_maintenances', [ + 'asset_maintenances_count' => $supplier->asset_maintenances_count, 'item' => trans('general.supplier') + ])); } catch (ItemStillHasLicenses $e) { - return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_licenses', ['licenses_count' => (int) $supplier->licenses_count])); + return redirect()->route('suppliers.index')->with('error', trans('general.bulk_delete_associations.assoc_licenses', [ + 'licenses_count' => (int) $supplier->licenses_count, 'item' => trans('general.supplier') + ])); } catch (\Exception $e) { report($e); return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.error')); diff --git a/resources/lang/en-US/admin/categories/message.php b/resources/lang/en-US/admin/categories/message.php index e9ee739d4b..0c1bbfe1e3 100644 --- a/resources/lang/en-US/admin/categories/message.php +++ b/resources/lang/en-US/admin/categories/message.php @@ -23,12 +23,6 @@ return array( 'error' => 'There was an issue deleting the category. Please try again.', 'success' => 'The category was deleted successfully.', 'bulk_success' => 'The Categories were deleted successfully.', - 'bulk_assoc_assets' => ':category_name still has associated assets and cannot be deleted. Please update your assets to no longer reference this supplier and try again.', - 'bulk_assoc_accessories' => ':category_name still has associated accessories and cannot be deleted. Please update your accessories to no longer reference this supplier and try again.', - 'bulk_assoc_consumables' => ':category_name still has associated consumables and cannot be deleted. Please update your consumables to no longer reference this supplier and try again.', - 'bulk_assoc_components' => ':category_name still has associated components and cannot be deleted. Please update your components to no longer reference this supplier and try again.', - 'bulk_assoc_licenses' => ':category_name still has associated licenses and cannot be deleted. Please update your licenses to no longer reference this supplier and try again.', - 'bulk_assoc_models' => ':category_name still has associated asset models and cannot be deleted. Please update your asset models to no longer reference this supplier and try again.', ) ); diff --git a/resources/lang/en-US/admin/manufacturers/message.php b/resources/lang/en-US/admin/manufacturers/message.php index 41063d34e4..8edd93dbb3 100644 --- a/resources/lang/en-US/admin/manufacturers/message.php +++ b/resources/lang/en-US/admin/manufacturers/message.php @@ -27,11 +27,6 @@ return array( 'error' => 'There was an issue deleting the manufacturer. Please try again.', 'success' => 'The Manufacturer was deleted successfully.', 'bulk_success' => 'The Manufacturers were deleted successfully.', - 'bulk_assoc_assets' => ':manufacturer_name still has associated assets and cannot be deleted. Please update your assets to no longer reference this supplier and try again.', - 'bulk_assoc_accessories' => ':manufacturer_name still has associated accessories and cannot be deleted. Please update your accessories to no longer reference this supplier and try again.', - 'bulk_assoc_consumables' => ':manufacturer_name still has associated consumables and cannot be deleted. Please update your consumables to no longer reference this supplier and try again.', - 'bulk_assoc_components' => ':manufacturer_name still has associated components and cannot be deleted. Please update your components to no longer reference this supplier and try again.', - 'bulk_assoc_licenses' => ':manufacturer_name still has associated licenses and cannot be deleted. Please update your licenses to no longer reference this supplier and try again.', ) ); diff --git a/resources/lang/en-US/admin/suppliers/message.php b/resources/lang/en-US/admin/suppliers/message.php index ee5b104028..a5f9ef02aa 100644 --- a/resources/lang/en-US/admin/suppliers/message.php +++ b/resources/lang/en-US/admin/suppliers/message.php @@ -22,12 +22,6 @@ return array( 'success' => 'Supplier was deleted successfully.', 'not_found' => 'Supplier not found.', 'bulk_success' => 'Suppliers were deleted successfully.', - 'bulk_assoc_assets' => ':supplier_name still has associated assets and cannot be deleted. Please update your assets to no longer reference this supplier and try again.', - 'bulk_assoc_licenses' => ':supplier_name still has associated licenses and cannot be deleted. Please update your licenses to no longer reference this supplier and try again.', - 'bulk_assoc_maintenances' => ':supplier_name still has associated maintenances and cannot be deleted. Please update your maintenances to no longer reference this supplier and try again.', - 'assoc_assets' => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ', - 'assoc_licenses' => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ', - 'assoc_maintenances' => 'This supplier is currently associated with :maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ', ) ); diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 1dd20887ce..12cdf9a184 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -614,6 +614,24 @@ return [ 'notes' => 'Add a note', ], + 'bulk_delete_associations' => [ + 'general_assoc_warning' => ':item_name still has associated items. Please remove them before deleting this :item.', + 'assoc_assets' => ':item_name is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this :item and try again.', + 'asset_models' => ':item_name is currently associated with :asset_count asset(s) and cannot be deleted. Please update your asset models to no longer reference this :item and try again.', + 'assoc_maintenances' => ':item_name is currently associated with :maintenance_count maintenance(s) and cannot be deleted. Please update your maintenances to no longer reference this :item and try again.', + 'assoc_accessories' => ':item_name is currently associated with :accessory_count accessory(ies) and cannot be deleted. Please update your accessories to no longer reference this :item and try again.', + 'assoc_consumables' => ':item_name is currently associated with :consumable_count consumable(s) and cannot be deleted. Please update your consumables to no longer reference this :item and try again.', + 'assoc_components' => ':item_name is currently associated with :component_count component(s) and cannot be deleted. Please update your components to no longer reference this :item and try again.', + 'assoc_licenses' => ':item_name is currently associated with :license_count license(s) and cannot be deleted. Please update your licenses to no longer reference this :item and try again.', + 'assoc_assets_no_count' => ':item_name is currently associated with other assets and cannot be deleted. Please update your assets to no longer reference this :item and try again.', + 'asset_models_no_count' => ':item_name is currently associated with other asset models and cannot be deleted. Please update your assets to no longer reference this :item and try again.', + 'assoc_maintenances_no_count' => ':item_name is currently associated with other maintenances and cannot be deleted. Please update your maintenances to no longer reference this :item and try again.', + 'assoc_accessories_no_count' => ':item_name is currently associated with other accessories and cannot be deleted. Please update your accessories to no longer reference this :item and try again.', + 'assoc_consumables_no_count' => ':item_name is currently associated with other consumables and cannot be deleted. Please update your consumables to no longer reference this :item and try again.', + 'assoc_components_no_count' => ':item_name is currently associated with other components and cannot be deleted. Please update your components to no longer reference this :item and try again.', + 'assoc_licenses_no_count' => ':item_name is currently associated with other licenses and cannot be deleted. Please update your licenses to no longer reference this :item and try again.', + ], + 'breadcrumb_button_actions' => [ 'edit_item' => 'Edit :name', 'checkout_item' => 'Checkout :name',