diff --git a/app/Http/Controllers/PersetujuanPenawaranController.php b/app/Http/Controllers/PersetujuanPenawaranController.php index e50f107..1af71bf 100644 --- a/app/Http/Controllers/PersetujuanPenawaranController.php +++ b/app/Http/Controllers/PersetujuanPenawaranController.php @@ -66,7 +66,8 @@ // Update the status of the related permohonan to 'spk' $permohonan = Permohonan::find(request()->get('permohonan_id')); if ($permohonan) { - $permohonan->status = 'spk'; + $permohonan->status_bayar = request()->get('status_bayar'); + $permohonan->status = 'spk'; $permohonan->save(); } @@ -85,9 +86,11 @@ /** * Display the specified resource. */ - public function show(PersetujuanPenawaran $persetujuanPenawaran) + public function show($id) { - return view('lpj::persetujuan_penawaran.show', compact('persetujuanPenawaran')); + $permohonan = Permohonan::find($id); + $permohonan->status='tender'; + return $permohonan->save(); } /** diff --git a/resources/views/persetujuan_penawaran/index.blade.php b/resources/views/persetujuan_penawaran/index.blade.php index ae3ec2c..6a31257 100644 --- a/resources/views/persetujuan_penawaran/index.blade.php +++ b/resources/views/persetujuan_penawaran/index.blade.php @@ -93,7 +93,7 @@ }).then((result) => { if (result.isConfirmed) { window.location.href = `persetujuan-penawaran/${data}/edit`; - } else if (result.isCancelled) { + } else if (result.dismiss==='cancel') { $.ajaxSetup({ headers: { 'X-CSRF-TOKEN': '{{ csrf_token() }}'