diff --git a/app/Http/Controllers/RegistrasiFinalController.php b/app/Http/Controllers/RegistrasiFinalController.php index 4ee203e..c82c2e6 100644 --- a/app/Http/Controllers/RegistrasiFinalController.php +++ b/app/Http/Controllers/RegistrasiFinalController.php @@ -145,7 +145,6 @@ public function edit($id) { - // $id => penawaran.id return view('lpj::registrasifinal.edit', compact('id')); } @@ -173,7 +172,7 @@ if ($datas->dokumen) { $pdfSPK_path = Storage::url($datas->dokumen); $datas->dokumen = $pdfSPK_path; - } + } $data['status'] = 'success'; $data['regions'] = $regions; diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index f5d599d..ee191db 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -152,13 +152,7 @@ use Illuminate\Support\Facades\Auth; 'kjpp.address as kjpp_address', 'jenis_laporan.name as jenis_laporan_name' )->first(); - // date_range - if($penawaran->start_date && $penawaran->end_date) - { - $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y'); - - } - + $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') ->leftJoin('jenis_jaminan', 'jenis_jaminan.id','=','dokumen_jaminan.jenis_jaminan_id') @@ -187,13 +181,6 @@ use Illuminate\Support\Facades\Auth; 'kjpp.address as kjpp_address', 'jenis_laporan.name as jenis_laporan_name' )->first(); - - // date_range - if($penawaran->start_date && $penawaran->end_date) - { - $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y'); - - } $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi) ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') @@ -254,4 +241,9 @@ use Illuminate\Support\Facades\Auth; return view('lpj::spk.dokumennya', compact('data', 'penawaran')); } + public function download($id) { + $document = Permohonan::find($id); + + return response()->download(storage_path('app/public/' .$document->dokumen)); + } } diff --git a/resources/views/registrasifinal/index.blade.php b/resources/views/registrasifinal/index.blade.php index df6bdce..808da23 100644 --- a/resources/views/registrasifinal/index.blade.php +++ b/resources/views/registrasifinal/index.blade.php @@ -136,10 +136,10 @@ title: 'Status', render: (item, data) => { return `
`; diff --git a/resources/views/spk/index.blade.php b/resources/views/spk/index.blade.php index f6e45bc..1f6bb0c 100644 --- a/resources/views/spk/index.blade.php +++ b/resources/views/spk/index.blade.php @@ -161,27 +161,27 @@ actions: { title: 'Status', render: (item, data) => { - var iconSpkShow =''; - var iconSpkCreate=''; + var spkShow =''; + var spkCreate=''; if(!data.dokumen) { - iconSpkCreate=` + spkCreate=` `; } else { - iconSpkShow =`