Merge branch 'staging' into feature/senior-officer

2025-03-05 13:35:12 +07:00
parent cc28ace415 05bf9e2af0
commit 976dab7566
20 changed files with 2116 additions and 1329 deletions
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -437,7 +437,11 @@ class ProsesPenawaranController extends Controller
    public function show($id)
    {
        $prosespenawaran  = PenawaranTender::find($id);
-        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
+        $permohonan = "";
+        if($prosespenawaran){
+            $permohonan = Permohonan::where('nomor_registrasi',$prosespenawaran->nomor_registrasi)->first();
+        }
+        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran','permohonan'));
    }

    public function updateDraft(Request $request, $id): JsonResponse