diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php index 35faa19..9074567 100644 --- a/app/Http/Controllers/SpkController.php +++ b/app/Http/Controllers/SpkController.php @@ -84,7 +84,7 @@ use Illuminate\Support\Facades\Auth; if ($obj->tanggal_permohonan) { $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y'); } - + if($obj->penawaran->tanggal_penilaian_sebelumnya) { $data[$i]->penawaran->tanggal_penilaian_sebelumnya = Carbon::parse($obj->penawaran->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s'); @@ -146,7 +146,7 @@ use Illuminate\Support\Facades\Auth; } public function edit($id) - { + { // dd(Carbon::now()->addDays(1)->format('d F Y')); // dd(Carbon::now()->subDays(1)->format('d F Y')); jenis_laporan_name $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id') @@ -178,7 +178,7 @@ use Illuminate\Support\Facades\Auth; if($penawaran->detail_penawaran_tgl_proposal) $penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y'); - + // generate no spk $spk_no_last=$penawaran->spk_no; if(!$spk_no_last) @@ -196,7 +196,7 @@ use Illuminate\Support\Facades\Auth; } // pengecekan perubahan jenis report // generate no spk - + // Jangka Waktu // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final) $jangka_waktu=''; @@ -207,17 +207,17 @@ use Illuminate\Support\Facades\Auth; $persetujuan_sla_final = '...'; if(null !==$penawaran->persetujuan) { - $sla_resume_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_resume); - $sla_final_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_final); + $sla_resume_text = $penawaran->persetujuan->sla_resume; + $sla_final_text = $penawaran->persetujuan->sla_final; $sla_resume_text_terbilang = ucfirst(terbilang($sla_resume_text)); $sla_final_text_terbilang = ucfirst(terbilang($sla_final_text)); - + $persetujuan_no_proposal = $penawaran->persetujuan->nomor_proposal_penawaran; $persetujuan_tgl_proposal = Carbon::parse($penawaran->persetujuan->tanggal_proposal_penawaran)->format('d F Y'); $persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')'; $persetujuan_sla_final = $sla_final_text.' ('.$sla_final_text_terbilang.')'; - + if($penawaran->penilaian_waktu_penilain) { $jangka_waktu_date_start=Carbon::parse($penawaran->penilaian_waktu_penilain)->addDays(1)->format('d F Y'); @@ -226,10 +226,10 @@ use Illuminate\Support\Facades\Auth; // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final) $jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end; // Jangka Waktu - - } + + } } - + return view('lpj::spk.edit', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final', 'jangka_waktu')); } @@ -264,7 +264,7 @@ use Illuminate\Support\Facades\Auth; ->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name'); $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first(); - + // Jangka Waktu // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final) $jangka_waktu=''; @@ -282,7 +282,7 @@ use Illuminate\Support\Facades\Auth; // $dataPermohonan=['dokumen' => $newFileNameWithPath]; // $data->update($dataPermohonan); // update table permohonan - + // update table penawaran $dataPenawaran['spk_dokumen_path'] = $newFileNameWithPath; // $spk_no_last=$penawaran->spk_no; @@ -296,7 +296,7 @@ use Illuminate\Support\Facades\Auth; $dataPenawaran['spk_no_core'] = $date_now.'_'.$spk_number; $penawaran->spk_no = $spk_no_last; - + } // pengecekan perubahan jenis report @@ -314,7 +314,7 @@ use Illuminate\Support\Facades\Auth; $penawaranM = PenawaranTender::find($penawaran->id); $penawaranM->update($dataPenawaran); // update table penawaran - + // pdf path $spkpenawaran_path = Storage::url($newFileNameWithPath); @@ -324,12 +324,12 @@ use Illuminate\Support\Facades\Auth; $persetujuan_sla_final = '...'; if(null !==$penawaran->persetujuan) { - $sla_resume_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_resume); - $sla_final_text = hitungHariKerja($penawaran->persetujuan->created_at,$penawaran->persetujuan->sla_final); + $sla_resume_text = $penawaran->persetujuan->sla_resume; + $sla_final_text = $penawaran->persetujuan->sla_final; $sla_resume_text_terbilang = ucfirst(terbilang($sla_resume_text)); $sla_final_text_terbilang = ucfirst(terbilang($sla_final_text)); - + $persetujuan_no_proposal = $penawaran->persetujuan->nomor_proposal_penawaran; $persetujuan_tgl_proposal = Carbon::parse($penawaran->persetujuan->tanggal_proposal_penawaran)->format('d F Y'); $persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')'; @@ -343,9 +343,9 @@ use Illuminate\Support\Facades\Auth; // date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final) $jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end; // Jangka Waktu - - } - + + } + } @@ -392,7 +392,7 @@ use Illuminate\Support\Facades\Auth; // dokumen pdf diambil dari penawaran.spk_dokumen_path $permohonan = Permohonan::find($id); $document = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first(); - + return response()->download(storage_path('app/public/' .$document->spk_dokumen_path)); } }