Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/Http/Controllers/Web/Produktivitas/PetaniController.php

app/Http/Controllers/Web/Produktivitas/PetaniController.php

@@ -266,38 +266,23 @@ class PetaniController extends Controller
     public function destroy(string $id)
     {
         if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
-<<<<<<< HEAD
-<<<<<<< HEAD
-            abort(403);
-        }
-
-        $petani = Petani::findOrFail($id);
-
-        if (auth()->user()->role->value === 'fasilitator' && $petani->created_by !== auth()->id()) {
-            abort(403);
-        }
-
-        DB::transaction(function () use ($petani) {
-            $petani->update([
-                'deleted_by' => auth()->id(),
-            ]);
-
-            $petani->delete();
-        });
-
-        return response()->json([
-            'message' => 'Data petani berhasil dihapus.',
-        ]);
-=======
-=======
->>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
             return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
         }
 
         try {
             $petani = Petani::findOrFail($id);
 
-            $petani->delete();
+            if (auth()->user()->role->value === 'fasilitator' && $petani->created_by !== auth()->id()) {
+                return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
+            }
+
+            DB::transaction(function () use ($petani) {
+                $petani->update([
+                    'deleted_by' => auth()->id(),
+                ]);
+
+                $petani->delete();
+            });
 
             return response()->json([
                 'status' => 'success',
@@ -310,10 +295,6 @@ class PetaniController extends Controller
                 'message' => 'Gagal menghapus data: ' . $e->getMessage()
             ], 500);
         }
-<<<<<<< HEAD
->>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
-=======
->>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
     }
 
     public function showImage(string $id, string $field)