From 78ca1d13351ff1f354026c3d46a69a260025e144 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Mon, 11 Aug 2025 21:07:08 -0500 Subject: [PATCH] some cleanup --- app/Http/Controllers/Api/CategoriesController.php | 2 +- app/Http/Controllers/Api/ManufacturersController.php | 4 +--- app/Http/Controllers/Api/SuppliersController.php | 2 +- app/Http/Controllers/BulkCategoriesController.php | 1 - app/Http/Controllers/BulkManufacturersController.php | 1 - app/Http/Controllers/BulkSuppliersController.php | 1 - app/Http/Controllers/ManufacturersController.php | 5 ++--- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index 04b57858a3..a8f4b1862f 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -223,7 +223,7 @@ class CategoriesController extends Controller } catch (\Throwable $e) { report($e); return response()->json( - Helper::formatStandardApiResponse('error', null, 'something went wrong, call support') + 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 9ea85a5e92..94298f34f2 100644 --- a/app/Http/Controllers/Api/ManufacturersController.php +++ b/app/Http/Controllers/Api/ManufacturersController.php @@ -199,12 +199,10 @@ class ManufacturersController extends Controller } catch (ModelStillHasChildren $e) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/manufacturers/message.assoc_users'))); } catch (\Exception $e) { - return response()->json(Helper::formatStandardApiResponse('error', null, 'something went wrong')); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))); } return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/manufacturers/message.delete.success'))); - - } /** diff --git a/app/Http/Controllers/Api/SuppliersController.php b/app/Http/Controllers/Api/SuppliersController.php index 1c3d06f358..599896327b 100644 --- a/app/Http/Controllers/Api/SuppliersController.php +++ b/app/Http/Controllers/Api/SuppliersController.php @@ -207,7 +207,7 @@ class SuppliersController extends Controller } 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')); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.something_went_wrong'))); } return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/suppliers/message.delete.success'))); diff --git a/app/Http/Controllers/BulkCategoriesController.php b/app/Http/Controllers/BulkCategoriesController.php index 449b08878d..fbc17de5e8 100644 --- a/app/Http/Controllers/BulkCategoriesController.php +++ b/app/Http/Controllers/BulkCategoriesController.php @@ -17,7 +17,6 @@ class BulkCategoriesController extends Controller { public function destroy(Request $request) { - // Authorize the user to delete categories $this->authorize('delete', Category::class); $errors = []; diff --git a/app/Http/Controllers/BulkManufacturersController.php b/app/Http/Controllers/BulkManufacturersController.php index 8f78b643dd..2a3f418ef1 100644 --- a/app/Http/Controllers/BulkManufacturersController.php +++ b/app/Http/Controllers/BulkManufacturersController.php @@ -17,7 +17,6 @@ class BulkManufacturersController extends Controller { public function destroy(Request $request) { - // hm, we actually probably need to do this on a per model basis below, but that makes this a little dirtier so leaving like this for now. $this->authorize('delete', Manufacturer::class); $errors = []; diff --git a/app/Http/Controllers/BulkSuppliersController.php b/app/Http/Controllers/BulkSuppliersController.php index 036d67b4b5..a0dfe0bac7 100644 --- a/app/Http/Controllers/BulkSuppliersController.php +++ b/app/Http/Controllers/BulkSuppliersController.php @@ -13,7 +13,6 @@ class BulkSuppliersController extends Controller { public function destroy(Request $request) { - // Authorize the user to delete suppliers $this->authorize('delete', Supplier::class); $errors = []; diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index 1da741af33..584be275a9 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -173,18 +173,17 @@ class ManufacturersController extends Controller } catch (ModelStillHasChildren $e) { return redirect()->route('manufacturers.index')->with('error', trans('admin/manufacturers/message.assoc_users')); } catch (\Exception $e) { - return redirect()->route('manufacturers.index')->with('error', 'something went wrong'); + 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 + // commenting it out for now because it's weird... //if ($manufacturer->deleted_at === null) { // $manufacturer->delete(); //} else { // $manufacturer->forceDelete(); //} - // Redirect to the manufacturers management page return redirect()->route('manufacturers.index')->with('success', trans('admin/manufacturers/message.delete.success')); }