From 6b25bff2c4c4e70be855c4c10aead3ef426559f5 Mon Sep 17 00:00:00 2001 From: SyaharaniSalsabilla Date: Tue, 22 Sep 2026 10:59:55 +0700 Subject: [PATCH] Merge branch 'main' of https://git.probindo.com/Probindo/database-pertani-web --- app/Http/Controllers/Web/Produktivitas/PetaniController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/Web/Produktivitas/PetaniController.php b/app/Http/Controllers/Web/Produktivitas/PetaniController.php index 2478e1b..abebf58 100644 --- a/app/Http/Controllers/Web/Produktivitas/PetaniController.php +++ b/app/Http/Controllers/Web/Produktivitas/PetaniController.php @@ -266,6 +266,7 @@ class PetaniController extends Controller public function destroy(string $id) { if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) { +<<<<<<< HEAD <<<<<<< HEAD abort(403); } @@ -288,6 +289,8 @@ class PetaniController extends Controller 'message' => 'Data petani berhasil dihapus.', ]); ======= +======= +>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f return response()->json(['message' => 'Anda tidak memiliki akses.'], 403); } @@ -307,6 +310,9 @@ class PetaniController extends Controller 'message' => 'Gagal menghapus data: ' . $e->getMessage() ], 500); } +<<<<<<< HEAD +>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f +======= >>>>>>> 16903b21e36609a7257f376b49762e4b5070024f }