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

✨ feat(noc): implementasi sistem pembayaran dengan tracking nomor tiket dan status kurang/lebih bayar

Browse Source 
- Tambah field `nomor_tiket`, `nominal_kurang_bayar`, `bukti_ksl_kurang_bayar`, `nomor_rekening_lebih_bayar`, `bukti_ksl_lebih_bayar` di tabel `persetujuan_penawaran` & `noc`
- Update model `Noc` & `PersetujuanPenawaran` dengan fillable baru + migrasi database
- Update validasi di `NocRequest` & `PersetujuanPenawaranRequest` (nomor tiket, bukti KSL, kurang bayar, string max length)
- Restructure menu pembayaran dengan submenu *Kurang Bayar* & *Lebih Bayar*
- Tambah kolom "Nomor Tiket" di tabel & DataTable pembayaran
- Perbaikan tampilan: formatting, CSS, responsive layout, display cabang (code - name)
- Tambah routes `pembayaran.kurang.index` & `pembayaran.lebih.index` + integrasi controller
- Update `module.json` untuk menu, permission, roles, icon, dan styling
This commit is contained in:
Daeng Deni Mardaeni
2025-09-12 09:23:13 +07:00
parent ba29f5ee8e
commit 2433aacfbc
8 changed files with 135 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Requests/NocRequest.php
View File

@@ -95,12 +95,16 @@
$fileRule = 'nullable|file|mimes:' . self::ALLOWED_FILE_TYPES . '|max:' . self::MAX_FILE_SIZE; $fileRule = 'nullable|file|mimes:' . self::ALLOWED_FILE_TYPES . '|max:' . self::MAX_FILE_SIZE;
return [ return [
'nominal_penyelesaian' => 'nullable|numeric|min:0', 'nominal_penyelesaian' => 'nullable|numeric|min:0',
'status_penyelesaian' => 'nullable|boolean', 'status_penyelesaian' => 'nullable|boolean',
'tanggal_penyelesaian' => 'nullable|date', 'tanggal_penyelesaian' => 'nullable|date',
'bukti_penyelesaian' => $fileRule, 'bukti_penyelesaian' => $fileRule,
'memo_penyelesaian' => $fileRule, 'memo_penyelesaian' => $fileRule,
'catatan_noc' => 'nullable|string', 'catatan_noc' => 'nullable|string',
'nomor_tiket' => 'nullable|string',
'nomor_rekening_lebih_bayar' => 'nullable|string',
'bukti_ksl_lebih_bayar' => 'nullable|string',
'bukti_ksl_kurang_bayar' => 'nullable|string'
]; ];
} }

2
app/Http/Requests/PersetujuanPenawaranRequest.php
View File

@@ -18,6 +18,8 @@
'penawaran_id' => 'nullable|exists:penawaran,id', 'penawaran_id' => 'nullable|exists:penawaran,id',
'nomor_proposal_penawaran' => 'nullable|string|max:255', 'nomor_proposal_penawaran' => 'nullable|string|max:255',
'nomor_tiket' => 'nullable|string|max:100', 'nomor_tiket' => 'nullable|string|max:100',
'nominal_kurang_bayar' => 'nullable|string|max:100',
'bukti_ksl_kurang_bayar' => 'nullable|string|max:100',
'tanggal_proposal_penawaran' => 'nullable|date', 'tanggal_proposal_penawaran' => 'nullable|date',
'biaya_final' => 'nullable|numeric|min:0', 'biaya_final' => 'nullable|numeric|min:0',
'sla_resume' => 'nullable|numeric|min:0', 'sla_resume' => 'nullable|numeric|min:0',

4
app/Models/Noc.php
View File

@@ -11,6 +11,7 @@ class Noc extends Base
protected $fillable = [ protected $fillable = [
'permohonan_id', 'permohonan_id',
'persetujuan_penawaran_id', 'persetujuan_penawaran_id',
'nomor_tiket',
'bukti_bayar', 'bukti_bayar',
'nominal_bayar', 'nominal_bayar',
'total_pembukuan', 'total_pembukuan',
@@ -36,6 +37,9 @@ class Noc extends Base
'authorized_status', 'authorized_status',
'authorized_at', 'authorized_at',
'authorized_by', 'authorized_by',
'nomor_rekening_lebih_bayar',
'bukti_ksl_lebih_bayar',
'bukti_ksl_kurang_bayar'
]; ];
protected $casts = [ protected $casts = [

2
app/Models/PersetujuanPenawaran.php
View File

@@ -14,6 +14,8 @@
'penawaran_id', 'penawaran_id',
'nomor_proposal_penawaran', 'nomor_proposal_penawaran',
'nomor_tiket', 'nomor_tiket',
'nominal_kurang_bayar',
'bukti_ksl_kurang_bayar',
'tanggal_proposal_penawaran', 'tanggal_proposal_penawaran',
'biaya_final', 'biaya_final',
'sla_resume', 'sla_resume',

18
database/migrations/2025_09_11_145857_add_nomor_tiket_to_persetujuan_penawaran_table.php
View File

@@ -16,6 +16,19 @@ return new class extends Migration
// Menambahkan kolom nomor_tiket setelah nomor_proposal_penawaran // Menambahkan kolom nomor_tiket setelah nomor_proposal_penawaran
$table->string('nomor_tiket', 100)->nullable()->after('nomor_proposal_penawaran') $table->string('nomor_tiket', 100)->nullable()->after('nomor_proposal_penawaran')
->comment('Nomor tiket untuk tracking persetujuan penawaran'); ->comment('Nomor tiket untuk tracking persetujuan penawaran');
$table->string('nominal_kurang_bayar')->nullable()->after('nomor_proposal_penawaran');
$table->string('bukti_ksl_kurang_bayar')->nullable()->after('nominal_kurang_bayar');
});
Schema::table('noc', function (Blueprint $table) {
// Menambahkan kolom nomor_tiket setelah nomor_proposal_penawaran
$table->string('nomor_tiket', 100)->nullable()->after('persetujuan_penawaran_id')
->comment('Nomor tiket untuk tracking persetujuan penawaran');
$table->string('nomor_rekening_lebih_bayar',20)->nullable()->after('nominal_lebih_bayar');
$table->string('bukti_ksl_lebih_bayar')->nullable()->after('nomor_rekening_lebih_bayar');
$table->string('bukti_ksl_kurang_bayar')->nullable()->after('bukti_ksl_lebih_bayar');
}); });
} }
@@ -29,5 +42,10 @@ return new class extends Migration
// Menghapus kolom nomor_tiket // Menghapus kolom nomor_tiket
$table->dropColumn('nomor_tiket'); $table->dropColumn('nomor_tiket');
}); });
Schema::table('noc', function (Blueprint $table) {
// Menghapus kolom nomor_tiket
$table->dropColumn('nomor_tiket');
});
} }
}; };

59
module.json
View File

@@ -378,6 +378,53 @@
"pemohon-ao" "pemohon-ao"
] ]
}, },
{
"title": "Pembayaran",
"path": "pembayaran",
"icon": "ki-filled ki-credit-cart text-lg text-primary",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"pemohon-ao"
],
"sub": [
{
"title": "Pembayaran",
"path": "pembayaran",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"admin"
]
},
{
"title": "Kurang Bayar",
"path": "pembayaran.kurang",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"admin"
]
},
{
"title": "Lebih Bayar",
"path": "pembayaran.lebih",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"admin"
]
}
]
},
{ {
"title": "NOC", "title": "NOC",
"path": "noc", "path": "noc",
@@ -513,18 +560,6 @@
"admin" "admin"
] ]
}, },
{
"title": "Pembayaran",
"path": "pembayaran",
"icon": "ki-filled ki-credit-cart text-lg text-primary",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"pemohon-ao"
]
},
{ {
"title": "Data Debitur", "title": "Data Debitur",
"path": "debitur", "path": "debitur",

94
resources/views/pembayaran/index.blade.php
View File

@@ -6,9 +6,9 @@
@section('content') @section('content')
<div class="grid"> <div class="grid">
<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" <div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
id="pembayaran-table" data-api-url="{{ route('pembayaran.datatables') }}"> data-datatable-state-save="false" id="pembayaran-table" data-api-url="{{ route('pembayaran.datatables') }}">
<div class="card-header bg-agi-50 py-5 flex-wrap"> <div class="flex-wrap py-5 card-header bg-agi-50">
<h3 class="card-title"> <h3 class="card-title">
Daftar Pembayaran Daftar Pembayaran
</h3> </h3>
@@ -26,51 +26,55 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="scrollable-x-auto"> <div class="scrollable-x-auto">
<table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" <table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
data-datatable-table="true"> data-datatable-table="true">
<thead> <thead>
<tr> <tr>
<th class="w-14"> <th class="w-14">
<input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/> <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
</th> </th>
<th class="min-w-[150px]" data-datatable-column="nomor_registrasi"> <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
<span class="sort"> <span class="sort-label"> Nomor Registrasi </span> <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="tanggal_permohonan"> <th class="min-w-[150px]" data-datatable-column="nomor_tiket">
<span class="sort"> <span class="sort-label"> Tanggal Permohonan </span> <span class="sort"> <span class="sort-label"> Nomor Tiket </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="user_id"> <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
<span class="sort"> <span class="sort-label"> User Pemohon </span> <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="branch_id"> <th class="min-w-[150px]" data-datatable-column="user_id">
<span class="sort"> <span class="sort-label"> Cabang Pemohon </span> <span class="sort"> <span class="sort-label"> User Pemohon </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px]" data-datatable-column="debitur_id"> <th class="min-w-[150px]" data-datatable-column="branch_id">
<span class="sort"> <span class="sort-label"> Debitur </span> <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px] text-center" data-datatable-column="tujuan_penilaian_id"> <th class="min-w-[150px]" data-datatable-column="debitur_id">
<span class="sort"> <span class="sort-label"> Status Bayar </span> <span class="sort"> <span class="sort-label"> Debitur </span>
<span class="sort-icon"> </span> </span> <span class="sort-icon"> </span> </span>
</th> </th>
<th class="min-w-[150px] text-center" data-datatable-column="tujuan_penilaian_id">
<span class="sort"> <span class="sort-label"> Status Bayar </span>
<span class="sort-icon"> </span> </span>
</th>
<th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th> <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
</tr> </tr>
</thead> </thead>
</table> </table>
</div> </div>
<div <div
class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium"> 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 items-center gap-2"> <div class="flex gap-2 items-center">
Show 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 page
</div> </div>
<div class="flex items-center gap-4"> <div class="flex gap-4 items-center">
<span data-datatable-info="true"> </span> <span data-datatable-info="true"> </span>
<div class="pagination" data-datatable-pagination="true"> <div class="pagination" data-datatable-pagination="true">
</div> </div>
@@ -166,6 +170,9 @@
nomor_registrasi: { nomor_registrasi: {
title: 'Nomor Registrasi', title: 'Nomor Registrasi',
}, },
nomor_tiket: {
title: 'Nomor Tiket',
},
tanggal_permohonan: { tanggal_permohonan: {
title: 'Tanggal Permohonan' title: 'Tanggal Permohonan'
}, },
@@ -179,7 +186,7 @@
title: 'Cabang Pemohon', title: 'Cabang Pemohon',
render: (item, data) => { render: (item, data) => {
if (data.branch) { if (data.branch) {
return `${data.branch.name}`; return `${data.branch.code} - ${data.branch.name}`;
} }
return '-'; return '-';
}, },
@@ -205,8 +212,8 @@
actions: { actions: {
title: 'Status', title: 'Status',
render: (item, data) => { render: (item, data) => {
return `<div class="flex justify-center gap-2"> return `<div class="flex gap-2 justify-center">
<a class="btn btn-icon btn-clear btn-warning " href="pembayaran/${data.id}/edit" title="Lakukan Pembayaran"> <a class="btn btn-icon btn-clear btn-warning" href="pembayaran/${data.id}/edit" title="Lakukan Pembayaran">
<i class="ki-outline ki-credit-cart"></i> <i class="ki-outline ki-credit-cart"></i>
</a> </a>
</div>`; </div>`;
@@ -217,11 +224,10 @@
let dataTable = new KTDataTable(element, dataTableOptions); let dataTable = new KTDataTable(element, dataTableOptions);
// Custom search functionality // Custom search functionality
searchInput.addEventListener('input', function () { searchInput.addEventListener('input', function() {
const searchValue = this.value.trim(); const searchValue = this.value.trim();
dataTable.search(searchValue, true); dataTable.search(searchValue, true);
}); });
</script> </script>
@endpush @endpush

2
routes/registrasi.php
View File

@@ -131,6 +131,8 @@ Route::middleware(['auth'])->group(function () {
Route::controller(PembayaranController::class)->group(function () { Route::controller(PembayaranController::class)->group(function () {
Route::get('/pembayaran', 'index')->name('pembayaran.index'); Route::get('/pembayaran', 'index')->name('pembayaran.index');
Route::get('/pembayaran/kurang', 'kurang')->name('pembayaran.kurang.index');
Route::get('/pembayaran/lebih', 'lebih')->name('pembayaran.lebih.index');
Route::get('/pembayaran/{pembayaran}/edit', 'edit')->name('pembayaran.edit'); Route::get('/pembayaran/{pembayaran}/edit', 'edit')->name('pembayaran.edit');
Route::post('pembayaran','store')->name('pembayaran.store'); Route::post('pembayaran','store')->name('pembayaran.store');
Route::get('/pembayaran/datatables', 'dataForDatatables')->name('pembayaran.datatables'); Route::get('/pembayaran/datatables', 'dataForDatatables')->name('pembayaran.datatables');