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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

Browse Source
This commit is contained in:
Andy Chaerudin
2024-11-21 13:25:52 +07:00
parent 3b616f21ba d4662d413f
commit c08b93aa81
9 changed files with 916 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/Http/Controllers/PersetujuanPenawaranController.php
View File

@@ -12,6 +12,7 @@
class PersetujuanPenawaranController extends Controller
{
public $user;
/**
* Display a listing of the resource.
*/
@@ -21,6 +22,12 @@
return view('lpj::persetujuan_penawaran.index', compact('persetujuanPenawarans'));
}
/**
* Store a newly created resource in storage.
*/
/**
* Store a newly created resource in storage.
*/
/**
* Store a newly created resource in storage.
*/
@@ -29,10 +36,43 @@
$validated = $request->validated();
$validated['created_by'] = Auth::id();
PersetujuanPenawaran::create($validated);
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']],
$validated,
);
$folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
if ($request->hasFile('file_persetujuan_penawaran')) {
$persetujuanPenawaran->file_persetujuan_penawaran = $request->file('file_persetujuan_penawaran')->store(
$folderPath,
'public',
);
}
if ($request->hasFile('surat_representasi')) {
$persetujuanPenawaran->surat_representasi = $request->file('surat_representasi')->store(
$folderPath,
'public',
);
}
if ($request->hasFile('bukti_bayar')) {
$persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
}
$persetujuanPenawaran->save();
// Update the status of the related permohonan to 'spk'
$permohonan = Permohonan::find(request()->get('permohonan_id'));
if ($permohonan) {
$permohonan->status_bayar = request()->get('status_bayar');
$permohonan->status = 'spk';
$permohonan->save();
}
return redirect()
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran created successfully.');
->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
}
/**
@@ -46,17 +86,21 @@
/**
* 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();
}
/**
* Show the form for editing the specified resource.
*/
public function edit(PersetujuanPenawaran $persetujuanPenawaran)
public function edit($id)
{
return view('lpj::persetujuan_penawaran.edit', compact('persetujuanPenawaran'));
$permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
}
/**
@@ -97,8 +141,7 @@
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q
->where('nomor_registrasi', 'LIKE', "%$search%");
$q->where('nomor_registrasi', 'LIKE', "%$search%");
});
}
@@ -125,7 +168,7 @@
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->with(['debiture','penawaranTender.detail'])->get();
$data = $query->with(['debiture', 'penawaranTender.detail', 'penawaranTender.persetujuan'])->get();
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));