daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-03-05 13:35:12 +07:00
parent cc28ace415 05bf9e2af0
commit 976dab7566
20 changed files with 2116 additions and 1329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -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

2
app/Http/Requests/CustomFieldRequest.php
View File

@@ -15,7 +15,7 @@ class CustomFieldRequest extends FormRequest
{
return [
'name' => 'required|max:255',
'type' => 'required|in:text,select,radio,checkbox',
'type' => 'required|in:text,select,radio,checkbox,date,number',
'label' => 'nullable|max:255',
'urutan_prioritas' => [
'nullable',