Tambahkan relasi permohonan dan pembaruan logika tampilan

- Menambahkan kolom dan relasi `permohonan_id` pada model, request, dan database terkait.
- Memperbarui logika rendering di tampilan untuk mendukung data dari relasi `permohonan`.
- Menambahkan fitur baru di menu `Approval Pembayaran` dengan pengaturan role dan icon spesifik.
This commit is contained in:
Daeng Deni Mardaeni
2024-12-23 20:13:17 +07:00
parent c90535b5ba
commit 6d9f5f6d28
6 changed files with 38 additions and 6 deletions

View File

@@ -175,6 +175,8 @@
[ [
'penawaran.permohonan.debiture', 'penawaran.permohonan.debiture',
'penawaran.permohonan.branch', 'penawaran.permohonan.branch',
'permohonan.debiture',
'permohonan.branch',
'penawaran.detail', 'penawaran.detail',
'penawaran.persetujuan', 'penawaran.persetujuan',
], ],

View File

@@ -14,6 +14,7 @@
public function rules() public function rules()
{ {
return [ return [
'permohonan_id' => 'nullable|exists:permohonan,id',
'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',
'tanggal_proposal_penawaran' => 'nullable|date', 'tanggal_proposal_penawaran' => 'nullable|date',

View File

@@ -38,7 +38,6 @@
'registrasi_catatan', 'registrasi_catatan',
'registrasi_by', 'registrasi_by',
'registrasi_at', 'registrasi_at',
'jenis_penilaian_id',
'region_id', 'region_id',
'sla', 'sla',
// andy add // andy add
@@ -134,6 +133,10 @@
return $this->belongsTo(JenisFasilitasKredit::class); return $this->belongsTo(JenisFasilitasKredit::class);
} }
public function jenisPenilaian(){
return $this->belongsTo(JenisPenilaian::class);
}
public function penilaian() public function penilaian()
{ {
return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi'); return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');

View File

@@ -10,6 +10,7 @@
protected $table = 'persetujuan_penawaran'; protected $table = 'persetujuan_penawaran';
protected $fillable = [ protected $fillable = [
'permohonan_id',
'penawaran_id', 'penawaran_id',
'nomor_proposal_penawaran', 'nomor_proposal_penawaran',
'tanggal_proposal_penawaran', 'tanggal_proposal_penawaran',
@@ -42,6 +43,10 @@
return $this->belongsTo(PenawaranTender::class, 'penawaran_id'); return $this->belongsTo(PenawaranTender::class, 'penawaran_id');
} }
public function permohonan(){
return $this->belongsTo(Permohonan::class, 'permohonan_id');
}
// Relationship with Region // Relationship with Region
public function region() public function region()
{ {

View File

@@ -166,7 +166,19 @@
{ {
"title": "Pembayaran", "title": "Pembayaran",
"path": "pembayaran", "path": "pembayaran",
"icon": "ki-filled ki-file-added text-lg text-success", "icon": "ki-filled ki-credit-cart text-lg text-primary",
"classes": "",
"attributes": [],
"permission": "",
"roles": [
"administrator",
"pemohon-ao"
]
},
{
"title": "Approval Pembayaran",
"path": "pembayaran.approval",
"icon": "ki-filled ki-ensure text-lg text-info",
"classes": "", "classes": "",
"attributes": [], "attributes": [],
"permission": "", "permission": "",

View File

@@ -125,29 +125,38 @@
nomor_registrasi: { nomor_registrasi: {
title: 'Nomor Registrasi', title: 'Nomor Registrasi',
render: (item, data) => { render: (item, data) => {
return `${data.penawaran.nomor_registrasi}`; if(data.permohonan) {
return `${data.permohonan.nomor_registrasi}`;
}
return `${data.penawaran.permohonan.nomor_registrasi}`;
}, },
}, },
nama_debitur: { nama_debitur: {
title: 'Nama Debitur', title: 'Nama Debitur',
render: (item, data) => { render: (item, data) => {
if(data.permohonan) {
return `${data.permohonan.debiture.name}`;
}
return `${data.penawaran.permohonan.debiture.name}`; return `${data.penawaran.permohonan.debiture.name}`;
}, },
}, },
cabang: { cabang: {
title: 'Cabang', title: 'Cabang',
render: (item, data) => { render: (item, data) => {
if(data.permohonan) {
return `${data.permohonan.branch.name}`;
}
return `${data.penawaran.permohonan.branch.name}`; return `${data.penawaran.permohonan.branch.name}`;
}, },
}, },
tanggal_setor: { tanggal_setor: {
title: 'Cabang', title: 'Tanggal Setor',
render: (item, data) => { render: (item, data) => {
return `${window.formatTanggalIndonesia(data.created_at)}`; return `${window.formatTanggalIndonesia(data.created_at)}`;
}, },
}, },
nominal_bayar: { nominal_bayar: {
title: 'Cabang', title: 'Nominal Bayar',
render: (item, data) => { render: (item, data) => {
return `${window.formatRupiah(data.nominal_bayar)}`; return `${window.formatRupiah(data.nominal_bayar)}`;
}, },
@@ -165,7 +174,7 @@
}, },
}, },
tanggal_penyelesaian: { tanggal_penyelesaian: {
title: 'Cabang', title: 'Tanggal Penyelesaian',
render: (item, data) => { render: (item, data) => {
if(data.status==1) { if(data.status==1) {
return `${window.formatTanggalIndonesia(data.updated_at)}`; return `${window.formatTanggalIndonesia(data.updated_at)}`;