Probindo/database-pertani-web
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	app/Http/Controllers/Web/Produktivitas/PetaniController.php
This commit is contained in:
Syaharani
2026-09-22 11:02:02 +07:00
parent 6b25bff2c4 16903b21e3
commit 607533a327
1 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Produktivitas/PetaniController.php
+3 -22
View File
@@ -266,15 +266,14 @@ class PetaniController extends Controller
public function destroy(string $id)
{
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
<<<<<<< HEAD
<<<<<<< HEAD
abort(403);
return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
}
try {
$petani = Petani::findOrFail($id);
if (auth()->user()->role->value === 'fasilitator' && $petani->created_by !== auth()->id()) {
abort(403);
return response()->json(['message' => 'Anda tidak memiliki akses.'], 403);
}
DB::transaction(function () use ($petani) {
@@ -285,20 +284,6 @@ class PetaniController extends Controller
$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();
return response()->json([
'status' => 'success',
'message' => 'Data petani berhasil dihapus.'
@@ -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)