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

sosial ekonomi update

Browse Source
This commit is contained in:
Syaharani
2026-07-06 13:29:25 +07:00
parent d0e41dc1d2
commit 13c71d2612
2 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php
+43 -34
View File
@@ -43,40 +43,40 @@ class SosialEkonomiController extends Controller
}
public function index(Request $request, Petani $petani)
{
$sosialEkonomi = SosialEkonomi::with([
'pendapatanKomoditas',
{
$sosialEkonomi = SosialEkonomi::with([
'pendapatanKomoditas',
'pendapatanLuarPertanian',
])
->where('petani_id', $petani->id)
->first();
$pendapatanKomoditas = $sosialEkonomi?->pendapatanKomoditas ?? collect();
$pendapatanKomoditasUtama = $pendapatanKomoditas->where('kategori', 'utama')->values();
$pendapatanKomoditasLainnya = $pendapatanKomoditas->where('kategori', 'lainnya')->values();
$pendapatanLuarPertanian = $sosialEkonomi?->pendapatanLuarPertanian?->values() ?? collect();
$komoditasPetani = $this->komoditasPetani($petani);
if ($request->expectsJson()) {
return response()->json($sosialEkonomi);
}
return view('produktivitas.petani.sosial-ekonomi.index', compact(
'petani',
'sosialEkonomi',
'komoditasPetani',
'pendapatanKomoditasUtama',
'pendapatanKomoditasLainnya',
'pendapatanLuarPertanian',
])
->where('petani_id', $petani->id)
->first();
$komoditasPetani = collect();
$pendapatanKomoditasUtama = $sosialEkonomi?->pendapatanKomoditas
->where('kategori', 'utama') ?? collect();
$pendapatanKomoditasLainnya = $sosialEkonomi?->pendapatanKomoditas
->where('kategori', 'lainnya') ?? collect();
$pendapatanLuarPertanian = $sosialEkonomi?->pendapatanLuarPertanian ?? collect();
if ($request->expectsJson()) {
return response()->json($sosialEkonomi);
));
}
return view('produktivitas.petani.sosial-ekonomi.index', compact(
'petani',
'sosialEkonomi',
'komoditasPetani',
'pendapatanKomoditasUtama',
'pendapatanKomoditasLainnya',
'pendapatanLuarPertanian',
));
}
public function store(Request $request): JsonResponse|RedirectResponse
public function store(Request $request, ?Petani $petani = null): JsonResponse|RedirectResponse
{
if ($petani) {
$request->merge(['petani_id' => $petani->id]);
}
$validated = $this->validateData($request);
$sosialEkonomi = DB::transaction(function () use ($validated) {
@@ -97,7 +97,7 @@ class SosialEkonomiController extends Controller
if (!$request->expectsJson()) {
return redirect()
->route('petani.sosial-ekonomi.edit', $sosialEkonomi->petani_id)
->route('petani.sosial-ekonomi.index', $sosialEkonomi->petani_id)
->with('success', 'Data sosial ekonomi berhasil disimpan.');
}
@@ -122,9 +122,9 @@ class SosialEkonomiController extends Controller
]);
}
public function update(Request $request, string $id): JsonResponse|RedirectResponse
public function update(Request $request, Petani|string $petani, ?string $sosialEkonomiId = null): JsonResponse|RedirectResponse
{
$sosialEkonomi = SosialEkonomi::findOrFail($id);
$sosialEkonomi = $this->findSosialEkonomi($petani, $sosialEkonomiId);
$validated = $this->validateData($request, $sosialEkonomi->id);
$sosialEkonomi = DB::transaction(function () use ($request, $validated, $sosialEkonomi) {
@@ -149,7 +149,7 @@ class SosialEkonomiController extends Controller
if (!$request->expectsJson()) {
return redirect()
->route('petani.sosial-ekonomi.edit', $sosialEkonomi->petani_id)
->route('petani.sosial-ekonomi.index', $sosialEkonomi->petani_id)
->with('success', 'Data sosial ekonomi berhasil diperbarui.');
}
@@ -306,4 +306,13 @@ class SosialEkonomiController extends Controller
->orderBy('nama')
->get();
}
private function findSosialEkonomi(Petani|string $petani, ?string $sosialEkonomiId = null): SosialEkonomi
{
if ($petani instanceof Petani) {
return SosialEkonomi::where('petani_id', $petani->id)->findOrFail($sosialEkonomiId);
}
return SosialEkonomi::findOrFail($petani);
}
}