feat(noc): tambahkan fitur bukti bayar dan nominal diterima
- Menambahkan kolom "Bukti Bayar" dan "Nominal Diterima" pada tampilan daftar noc. - Menambahkan input untuk bukti bayar dan nominal diterima pada form noc. - Mengubah logika pengecekan input file bukti KSL agar sesuai kondisi. - Memperbaiki placeholder dan label form untuk konsistensi. - Memperbaiki render data bukti bayar pada tabular untuk mendukung tindakan download atau lihat file. Signed-off-by: Daeng Deni Mardaeni <ddeni05@gmail.com>
This commit is contained in:
@@ -216,10 +216,13 @@
|
|||||||
$persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
|
$persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
|
||||||
true,
|
true,
|
||||||
),
|
),
|
||||||
'nominal_bayar' => currencyFormat(
|
'nominal_bayar' => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0,
|
||||||
$persetujuanPenawaran->noc->nominal_bayar ?? $persetujuanPenawaran->nominal_bayar ?? 0,
|
),
|
||||||
|
'nominal_diterima' => currencyFormat(
|
||||||
|
$persetujuanPenawaran->noc->nominal_bayar ?? 0,
|
||||||
),
|
),
|
||||||
'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
|
'bukti_ksl' => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
|
||||||
|
'bukti_bayar' => $persetujuanPenawaran->bukti_bayar ?? null,
|
||||||
'memo_penyelesaian' => $persetujuanPenawaran->noc->memo_penyelesaian ?? $persetujuanPenawaran->memo_penyelesaian ?? null,
|
'memo_penyelesaian' => $persetujuanPenawaran->noc->memo_penyelesaian ?? $persetujuanPenawaran->memo_penyelesaian ?? null,
|
||||||
'nominal_penyelesaian' => currencyFormat(
|
'nominal_penyelesaian' => currencyFormat(
|
||||||
$persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0,
|
$persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0,
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form action="{{ !$hasMemo ? route('noc.store') : route('noc.update',$persetujuanPenawaran) }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
|
<form action="{{ !$hasMemo ? route('noc.store') : route('noc.update',$persetujuanPenawaran) }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
|
||||||
@csrf
|
@csrf
|
||||||
@if($hasMemo)
|
@if(!$hasMemo)
|
||||||
@method('PUT')
|
@method('PUT')
|
||||||
@endif
|
@endif
|
||||||
<input type="hidden" name="penawaran_id" value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
|
<input type="hidden" name="penawaran_id" value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
|
||||||
@@ -53,7 +53,22 @@
|
|||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Total Harus Bayar
|
Bukti Pembayaran
|
||||||
|
</label>
|
||||||
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
|
@if(!empty($persetujuanPenawaran->bukti_bayar))
|
||||||
|
<div class="mt-2 flex items-center">
|
||||||
|
<a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
|
||||||
|
<i class="ki-filled ki-eye mr-2"></i> Lihat File
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
||||||
|
<label class="form-label max-w-56">
|
||||||
|
Nominal Bayar
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
<input type="number" name="total_harus_bayar" id="total_harus_bayar" class="input w-full @error('total_harus_bayar') border-danger bg-danger-light @enderror" value="{{ old('total_harus_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}" readonly>
|
<input type="number" name="total_harus_bayar" id="total_harus_bayar" class="input w-full @error('total_harus_bayar') border-danger bg-danger-light @enderror" value="{{ old('total_harus_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}" readonly>
|
||||||
@@ -65,7 +80,7 @@
|
|||||||
|
|
||||||
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
|
||||||
<label class="form-label max-w-56">
|
<label class="form-label max-w-56">
|
||||||
Nominal Bayar
|
Nominal Diterima
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<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->noc->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar" {{ $hasMemo ? 'readonly' : '' }}>
|
<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->noc->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar" {{ $hasMemo ? 'readonly' : '' }}>
|
||||||
@@ -93,7 +108,7 @@
|
|||||||
Bukti KSL
|
Bukti KSL
|
||||||
</label>
|
</label>
|
||||||
<div class="flex flex-wrap items-baseline w-full">
|
<div class="flex flex-wrap items-baseline w-full">
|
||||||
@if($hasMemo)
|
@if(!$hasMemo)
|
||||||
<input type="file" name="bukti_ksl" id="bukti_ksl" class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
|
<input type="file" name="bukti_ksl" id="bukti_ksl" class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
|
||||||
@error('bukti_ksl')
|
@error('bukti_ksl')
|
||||||
<em class="alert text-danger text-sm">{{ $message }}</em>
|
<em class="alert text-danger text-sm">{{ $message }}</em>
|
||||||
|
|||||||
@@ -53,6 +53,14 @@
|
|||||||
<span class="sort"> <span class="sort-label"> Nominal bayar </span>
|
<span class="sort"> <span class="sort-label"> Nominal bayar </span>
|
||||||
<span class="sort-icon"> </span> </span>
|
<span class="sort-icon"> </span> </span>
|
||||||
</th>
|
</th>
|
||||||
|
<th class="min-w-[150px]" data-datatable-column="bukti_bayar">
|
||||||
|
<span class="sort"> <span class="sort-label"> Bukti Bayar </span>
|
||||||
|
<span class="sort-icon"> </span> </span>
|
||||||
|
</th>
|
||||||
|
<th class="min-w-[150px]" data-datatable-column="nominal_diterima">
|
||||||
|
<span class="sort"> <span class="sort-label"> Nominal Diterima </span>
|
||||||
|
<span class="sort-icon"> </span> </span>
|
||||||
|
</th>
|
||||||
<th class="min-w-[150px]" data-datatable-column="bukti_ksl">
|
<th class="min-w-[150px]" data-datatable-column="bukti_ksl">
|
||||||
<span class="sort"> <span class="sort-label"> Bukti KSL </span>
|
<span class="sort"> <span class="sort-label"> Bukti KSL </span>
|
||||||
<span class="sort-icon"> </span> </span>
|
<span class="sort-icon"> </span> </span>
|
||||||
@@ -153,6 +161,21 @@
|
|||||||
nominal_bayar: {
|
nominal_bayar: {
|
||||||
title: 'Nominal Bayar',
|
title: 'Nominal Bayar',
|
||||||
},
|
},
|
||||||
|
bukti_bayar: {
|
||||||
|
title: 'Bukti KSL',
|
||||||
|
render: (item, data) => {
|
||||||
|
if (data.bukti_bayar) {
|
||||||
|
return `<a href="storage/${data.bukti_bayar}" download="storage/${data.bukti_bayar}" target="_blank" class="badge badge-sm badge-outline">
|
||||||
|
Download <i class="ki-filled ki-cloud-download"></i>
|
||||||
|
</a>`;
|
||||||
|
} else {
|
||||||
|
return '-';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
nominal_diterima: {
|
||||||
|
title: 'Nominal Diterima',
|
||||||
|
},
|
||||||
bukti_ksl: {
|
bukti_ksl: {
|
||||||
title: 'Bukti KSL',
|
title: 'Bukti KSL',
|
||||||
render: (item, data) => {
|
render: (item, data) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user