Merge branch 'main' of https://git.probindo.com/Probindo/database-pertani-web

2026-09-22 10:59:55 +07:00
parent 71b4d42ea2
commit 6b25bff2c4
1 changed files with 6 additions and 0 deletions
@@ -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
    }