Perbaikan Conflict SPK, Perubahan penyimpanan SPK PDF (awalnya di tabel permohonan.dokumen, menjadi penawaran.spk_dokumen_path)
This commit is contained in:
@@ -182,10 +182,29 @@ use Illuminate\Support\Facades\Auth;
|
||||
$spk_no_last = onLastnumberCodePenawaranSPK($penawaran->jenis_laporan_code);
|
||||
$penawaran->spk_no = $spk_no_last;
|
||||
}
|
||||
|
||||
// generate no spk
|
||||
|
||||
return view('lpj::spk.edit', compact('data', 'penawaran'));
|
||||
$persetujuan_no_proposal = $penawaran->detail_penawaran_no_proposal;
|
||||
$persetujuan_tgl_proposal = $penawaran->detail_penawaran_tgl_proposal;
|
||||
$persetujuan_sla_resume = '...';
|
||||
$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_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.')';
|
||||
|
||||
|
||||
}
|
||||
|
||||
return view('lpj::spk.edit', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final'));
|
||||
}
|
||||
|
||||
public function update(Request $request, $id): JsonResponse
|
||||
@@ -252,7 +271,27 @@ use Illuminate\Support\Facades\Auth;
|
||||
// pdf path
|
||||
$spkpenawaran_path = Storage::url($newFileNameWithPath);
|
||||
|
||||
$pdf =Pdf::loadView('lpj::spk.documentSPK', compact('data', 'penawaran'));
|
||||
$persetujuan_no_proposal = $penawaran->detail_penawaran_no_proposal;
|
||||
$persetujuan_tgl_proposal = $penawaran->detail_penawaran_tgl_proposal;
|
||||
$persetujuan_sla_resume = '...';
|
||||
$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_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.')';
|
||||
|
||||
|
||||
}
|
||||
|
||||
$pdf =Pdf::loadView('lpj::spk.documentSPK', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final'));
|
||||
$pdf->setPaper('A4', 'portrait');
|
||||
$content = $pdf->download()->getOriginalContent();
|
||||
Storage::put('public/'.$newFileNameWithPath,$content);
|
||||
|
||||
Reference in New Issue
Block a user