solve sosial ekonomi

2026-07-22 14:41:05 +07:00
parent 079e300d5d
commit 9576c6295e
3 changed files with 176 additions and 6 deletions
@@ -154,8 +154,7 @@ class SosialEkonomiController extends Controller
        });

        if (!$request->expectsJson()) {
-            return redirect()
-                ->route('petani.sosial-ekonomi.edit', [$sosialEkonomi->petani_id, $sosialEkonomi->id])
+            return $this->redirectToEditSection($sosialEkonomi, $request)
                ->with('success', 'Data sosial ekonomi berhasil disimpan.');
        }

@@ -206,8 +205,7 @@ class SosialEkonomiController extends Controller
        });

        if (!$request->expectsJson()) {
-            return redirect()
-                ->route('petani.sosial-ekonomi.edit', [$sosialEkonomi->petani_id, $sosialEkonomi->id])
+            return $this->redirectToEditSection($sosialEkonomi, $request)
                ->with('success', 'Data sosial ekonomi berhasil diperbarui.');
        }

@@ -218,6 +216,18 @@ class SosialEkonomiController extends Controller
        ]);
    }

+    private function redirectToEditSection(SosialEkonomi $sosialEkonomi, Request $request): RedirectResponse
+    {
+        $url = route('petani.sosial-ekonomi.edit', [$sosialEkonomi->petani_id, $sosialEkonomi->id]);
+        $fragment = $request->input('redirect_fragment');
+
+        if (is_string($fragment) && preg_match('/^[A-Za-z0-9_-]+$/', $fragment)) {
+            $url .= '#' . $fragment;
+        }
+
+        return redirect()->to($url);
+    }
+
    public function destroy(string $id): JsonResponse
    {
        $sosialEkonomi = SosialEkonomi::findOrFail($id);
@@ -589,6 +599,14 @@ class SosialEkonomiController extends Controller

        $payload = $this->normalizeSkorPayload($payload);

+        if (array_key_exists('ada_sengketa', $payload) && !filter_var($payload['ada_sengketa'], FILTER_VALIDATE_BOOLEAN)) {
+            $payload['keterangan_sengketa'] = null;
+            $payload['pihak_membantu_konflik'] = null;
+            $payload['pihak_membantu_konflik_nama'] = null;
+            $payload['tahun_bantuan_konflik'] = null;
+            $payload['status_konflik'] = null;
+        }
+
        if (($payload['pihak_membantu_konflik'] ?? null) === PihakMembantuKonflik::TIDAK_ADA_SELESAIKAN_SENDIRI->value) {
            $payload['pihak_membantu_konflik_nama'] = null;
            $payload['tahun_bantuan_konflik'] = null;