From 71b4d42ea23ec7739eced63f42bc079071aa2316 Mon Sep 17 00:00:00 2001
From: SyaharaniSalsabilla <syaharanibilla1@gmail.com>
Date: Tue, 22 Sep 2026 10:58:41 +0700
Subject: [PATCH] Merge branch 'main' of
 https://git.probindo.com/Probindo/database-pertani-web

---
 .../Web/Produktivitas/PetaniController.php    | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Web/Produktivitas/PetaniController.php b/app/Http/Controllers/Web/Produktivitas/PetaniController.php
index cfec8e9..2478e1b 100644
--- a/app/Http/Controllers/Web/Produktivitas/PetaniController.php
+++ b/app/Http/Controllers/Web/Produktivitas/PetaniController.php
@@ -263,12 +263,10 @@ class PetaniController extends Controller
         return redirect()->route('petani.edit', $petani->id)->with('success', 'Data petani berhasil diupdate.');
     }
 
-    /**
-     * Remove the specified resource from storage.
-     */
     public function destroy(string $id)
     {
         if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
+<<<<<<< HEAD
             abort(403);
         }
 
@@ -289,6 +287,27 @@ class PetaniController extends Controller
         return response()->json([
             'message' => 'Data petani berhasil dihapus.',
         ]);
+=======
+            return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
+        }
+
+        try {
+            $petani = Petani::findOrFail($id);
+
+            $petani->delete();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data petani berhasil dihapus.'
+            ]);
+
+        } catch (\Exception $e) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal menghapus data: ' . $e->getMessage()
+            ], 500);
+        }
+>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
     }
 
     public function showImage(string $id, string $field)