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

✨(persetujuan-penawaran): Tambah fitur tampilan file dan perbaiki logika persetujuan penawaran

Browse Source 
- Menambahkan auto-fill nominal_bayar dengan nilai biaya_final pada create persetujuan
- Memperbaiki query datatables dengan filter status penawaran lebih spesifik
- Menambahkan whereHas untuk memastikan hanya status 'persetujuan-penawaran' yang ditampilkan
- Menambahkan preview file upload (persetujuan_penawaran, surat_representasi, bukti_bayar)
- Menggunakan Storage::url() untuk generate URL file dengan keamanan optimal
- Menambahkan ikon eye dan badge untuk tampilan preview file
- Memperbaiki fallback nominal_bayar agar otomatis menggunakan biaya_final
- Merapikan struktur HTML dan urutan class Tailwind CSS di index dan form blade
- Mengoptimalkan AJAX request structure dan error handling agar lebih stabil
This commit is contained in:
Daeng Deni Mardaeni
2025-09-30 17:06:30 +07:00
parent 3aca1d46c2
commit 10b5a6c96c
3 changed files with 214 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
$validated = $request->validated();
$validated['created_by'] = Auth::id();
$validated['status'] = '0';
$validated['nominal_bayar'] = $validated['biaya_final'];
$persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
['penawaran_id' => $validated['penawaran_id']],
@@ -71,7 +72,7 @@
// Save NOC
try {
$noc = Noc::updateOrCreate([
Noc::updateOrCreate([
'permohonan_id' => $persetujuanPenawaran->permohonan_id,
'persetujuan_penawaran_id' => $persetujuanPenawaran->id
],[
@@ -179,8 +180,8 @@
public function edit($id)
{
$permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
$persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
return view('lpj::persetujuan_penawaran.form', compact('permohonan', 'persetujuanPenawaran'));
}
/**
@@ -201,8 +202,12 @@
}
// Retrieve data from the database
$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
//$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
$query = Permohonan::query()
->where(['status' => 'persetujuan-penawaran'])
->whereHas('penawaranTender', function ($q) {
$q->where('status', 'persetujuan-penawaran');
});
// Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');

33
resources/views/persetujuan_penawaran/form.blade.php
View File

@@ -60,6 +60,17 @@
<input type="file" name="file_persetujuan_penawaran" id="file_persetujuan_penawaran"
class="file-input w-full @error('file_persetujuan_penawaran') border-danger bg-danger-light @enderror"
accept=".pdf,.doc,.docx">
@if (isset($persetujuanPenawaran->file_persetujuan_penawaran) &&
!empty($persetujuanPenawaran->file_persetujuan_penawaran))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->file_persetujuan_penawaran) }}"
target="_blank" class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('file_persetujuan_penawaran')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror
@@ -74,6 +85,16 @@
<input type="file" name="surat_representasi" id="surat_representasi"
class="file-input w-full @error('surat_representasi') border-danger bg-danger-light @enderror"
accept=".pdf,.doc,.docx">
@if (isset($persetujuanPenawaran->surat_representasi) && !empty($persetujuanPenawaran->surat_representasi))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->surat_representasi) }}" target="_blank"
class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('surat_representasi')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror
@@ -87,7 +108,7 @@
<div class="flex flex-wrap items-baseline w-full">
<input type="number" name="nominal_bayar" id="nominal_bayar"
class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror"
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}"
value="{{ old('nominal_bayar', $persetujuanPenawaran->nominal_bayar ?? ($persetujuanPenawaran->biaya_final ?? '')) }}"
placeholder="Masukkan nominal bayar">
@error('nominal_bayar')
<em class="text-sm alert text-danger">{{ $message }}</em>
@@ -103,6 +124,16 @@
<input type="file" name="bukti_bayar" id="bukti_bayar"
class="file-input w-full @error('bukti_bayar') border-danger bg-danger-light @enderror"
accept=".pdf,.jpg,.jpeg,.png">
@if (isset($persetujuanPenawaran->bukti_bayar) && !empty($persetujuanPenawaran->bukti_bayar))
<div class="flex items-center mt-2">
<a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank"
class="badge badge-sm badge-outline badge-warning">
<i class="mr-2 ki-filled ki-eye"></i> Lihat File
</a>
</div>
@endif
@error('bukti_bayar')
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror

35
resources/views/persetujuan_penawaran/index.blade.php
View File

@@ -5,9 +5,11 @@
@endsection
@section('content')
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="persetujuan-penawaran-table" data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
<div class="card-header bg-agi-50 py-5 flex-wrap">
<div class="grid gap-5 mx-auto w-full lg:gap-7.5">
<div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
data-datatable-state-save="false" id="persetujuan-penawaran-table"
data-api-url="{{ route('persetujuan-penawaran.datatables') }}">
<div class="flex-wrap py-5 card-header bg-agi-50">
<h3 class="card-title">
Daftar Persetujuan Penawaran KJPP
</h3>
@@ -27,7 +29,8 @@
<div class="card-body">
<div class="scrollable-x-auto">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
<table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
data-datatable-table="true">
<thead>
<tr>
<th class="w-14">
@@ -71,13 +74,13 @@
</table>
</div>
<div
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div class="flex items-center gap-2">
class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
<div class="flex gap-2 items-center">
Show
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
<select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
page
</div>
<div class="flex items-center gap-4">
<div class="flex gap-4 items-center">
<span data-datatable-info="true"> </span>
<div class="pagination" data-datatable-pagination="true">
</div>
@@ -111,9 +114,12 @@
$.ajax(`persetujuan-penawaran/${data}`, {
type: 'GET',
data: {'status': 'tender'}
data: {
'status': 'tender'
}
}).then((response) => {
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang', 'success').then(() => {
swal.fire('Success!', 'Data Persetujuan telah dikembalikan untuk di kaji ulang',
'success').then(() => {
window.location.reload();
});
}).catch((error) => {
@@ -185,13 +191,18 @@
},
},
nominal_bayar: {
title: 'Nominal Bayar'
title: 'Nominal Bayar',
render: (item, data) => {
return data.penawaran_tender.persetujuan.nominal_bayar ?
`${window.formatRupiah(data.penawaran_tender.persetujuan.nominal_bayar)}` :
`${window.formatRupiah(data.penawaran_tender.persetujuan.biaya_final)}`;
},
},
catatan: {
title: 'Catatan',
render: (item, data) => {
if (data.penawaran_tender.persetujuan) {
return data.penawaran_tender.persetujuan.catatan;
return data.penawaran_tender.persetujuan.catatan ?? data.approve_keterangan_bayar;
}
return '-';
},