From 9f51a2cf4ea7bf608aabbb5ff048e1cf8f578a56 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Sat, 22 Mar 2025 16:29:41 +0700 Subject: [PATCH] fix(debitur): perbaikan logika akses dan tampilan pada halaman debitur - Menambahkan relasi 'permohonan' pada query data debitur. - Memperbaiki akses ke nomor registrasi pada dokumen jaminan. - Mengatur tampilan tombol 'Tambah Debitur' berdasarkan peran pengguna. - Menambahkan logika untuk memeriksa peran dan status permohonan sebelum menampilkan tombol aksi. --- app/Http/Controllers/DebitureController.php | 2 +- .../Controllers/DokumenJaminanController.php | 2 +- resources/views/debitur/index.blade.php | 45 +++++++++++++++---- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/DebitureController.php b/app/Http/Controllers/DebitureController.php index 94768ac..f8703be 100644 --- a/app/Http/Controllers/DebitureController.php +++ b/app/Http/Controllers/DebitureController.php @@ -167,7 +167,7 @@ $filteredRecords = $query->count(); // Get the data for the current page - $data = $query->with('branch')->get(); + $data = $query->with(['branch','permohonan'])->get(); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index f12ae72..44fbcc9 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -488,7 +488,7 @@ if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) { foreach ($documents as $document) { - $jenisJaminan = $document->debiture->permohonan->nomor_registrasi ?? 'Uncategorized'; + $jenisJaminan = $document->permohonan->nomor_registrasi ?? 'Uncategorized'; $folderName = $this->sanitizeFolderName($jenisJaminan); foreach ($document->detail as $detail) { diff --git a/resources/views/debitur/index.blade.php b/resources/views/debitur/index.blade.php index 06ce1fb..e0f8a77 100644 --- a/resources/views/debitur/index.blade.php +++ b/resources/views/debitur/index.blade.php @@ -20,7 +20,9 @@
Export to Excel - Tambah Debitur + @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao'])) + Tambah Debitur + @endif
@@ -90,6 +92,10 @@ @endsection @push('scripts') + +