Merge branch 'main' of https://git.probindo.com/Probindo/database-pertani-web
This commit is contained in:
@@ -266,6 +266,7 @@ class PetaniController extends Controller
|
|||||||
public function destroy(string $id)
|
public function destroy(string $id)
|
||||||
{
|
{
|
||||||
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
|
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
abort(403);
|
abort(403);
|
||||||
}
|
}
|
||||||
@@ -288,6 +289,8 @@ class PetaniController extends Controller
|
|||||||
'message' => 'Data petani berhasil dihapus.',
|
'message' => 'Data petani berhasil dihapus.',
|
||||||
]);
|
]);
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
|
||||||
return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
|
return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -307,6 +310,9 @@ class PetaniController extends Controller
|
|||||||
'message' => 'Gagal menghapus data: ' . $e->getMessage()
|
'message' => 'Gagal menghapus data: ' . $e->getMessage()
|
||||||
], 500);
|
], 500);
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
|
>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
|
||||||
|
=======
|
||||||
>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
|
>>>>>>> 16903b21e36609a7257f376b49762e4b5070024f
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user