From 4ac772ced4a883e101f0766c7ce0ddc275c07275 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 20 Jan 2025 14:59:53 +0700 Subject: [PATCH 1/2] fix(dokumen): perbaiki penamaan input custom_field - Mengubah format penamaan input custom_field untuk memastikan konsistensi. - Memperbaiki penggunaan tanda kurung pada penamaan agar sesuai dengan standar. --- resources/views/debitur/components/dokumen.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index f3a4db8..df7de0b 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -321,7 +321,7 @@ {{ str_replace('_',' ',$detail->jenisLegalitasJaminan->custom_field) }}
- +
@endif From 0a38319d98e8556227d1efa712cbc530c9721427 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Mon, 20 Jan 2025 15:17:04 +0700 Subject: [PATCH 2/2] feat(jaminan): tambahkan tampilan detail jaminan - Menambahkan pengecekan untuk menampilkan detail jaminan jika tersedia. - Menggunakan json_decode untuk mengurai data detail. - Menampilkan setiap detail dalam format yang rapi dengan pemisah. --- .../views/component/detail-jaminan.blade.php | 242 +++++++++--------- .../debitur/components/jaminan.blade.php | 17 ++ 2 files changed, 145 insertions(+), 114 deletions(-) diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index 6534b76..fde419a 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -183,59 +183,59 @@ Data Jaminan -@endif -
- @foreach ($permohonan->debiture->documents as $dokumen) -
- -
+ + + + +
- @if (!isset($status)) -
-
-

- Pemilik Jaminan: -

- + @if (!isset($status)) +
+
+

+ Pemilik Jaminan: +

+ {{ $dokumen->pemilik->name ?? '' }} -
-
-

- Jenis Jaminan: -

- +
+
+

+ Jenis Jaminan: +

+ {{ $dokumen->jenisJaminan->name ?? '' }} -
-
-

- Hubungan Pemilik Jaminan: -

- +
+
+

+ Hubungan Pemilik Jaminan: +

+ {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }} -
-
-

- Alamat Pemilik Jaminan: -

- +
+
+

+ Alamat Pemilik Jaminan: +

+ {{ $dokumen->pemilik->address ?? '' }},
{{ $dokumen->pemilik->village->name ?? '' }}, {{ $dokumen->pemilik->district->name ?? '' }}, @@ -243,80 +243,94 @@ {{ $dokumen->pemilik->province->name ?? '' }} - {{ $dokumen->pemilik->village->postal_code ?? '' }}
+
+
+ @endif +
+ + Download Semua Dokumen + + + @foreach ($dokumen->detail as $detail) + + + + + @if(isset($detail->details)) + @if(json_decode($detail->details)) + @foreach (json_decode($detail->details) as $key => $value) + + + + + @endforeach + @endif + @endif + + + + + + + + + @endforeach +
+ {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }} + + {{ $detail->name ?? '' }} +
+ {{ str_replace("_"," ",$key) ?? "" }} + + {{ $value ?? "" }} +
+ Dokumen Jaminan + + + @if (isset($detail->dokumen_jaminan)) + @php + $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) + ? json_decode($detail->dokumen_jaminan) + : [$detail->dokumen_jaminan]; + $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) + ? json_decode($detail->dokumen_nomor) + : ($detail->dokumen_nomor + ? [$detail->dokumen_nomor] + : []); + @endphp + @foreach ($dokumen_jaminan as $index => $dokumen) +
+ @if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo'])) + @if (!empty($dokumen_nomor)) + Nomor Dokumen : + {{ $dokumen_nomor[$index] }} + @endif + + {{ basename($dokumen) }} + + + @endif + Preview +
+
+ @endforeach + @endif + +
+ Keterangan + + {{ $detail->keterangan ?? '' }} +
- @endif -
- - Download Semua Dokumen - - - @foreach ($dokumen->detail as $detail) - - - - - - - - - - - - - @endforeach -
- {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }} - - {{ $detail->name ?? '' }} -
- Dokumen Jaminan - - - @if (isset($detail->dokumen_jaminan)) - @php - $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) - ? json_decode($detail->dokumen_jaminan) - : [$detail->dokumen_jaminan]; - $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) - ? json_decode($detail->dokumen_nomor) - : ($detail->dokumen_nomor - ? [$detail->dokumen_nomor] - : []); - @endphp - @foreach ($dokumen_jaminan as $index => $dokumen) -
- @if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo'])) - @if (!empty($dokumen_nomor)) - Nomor Dokumen : - {{ $dokumen_nomor[$index] }} - @endif - - {{ basename($dokumen) }} - - - @endif - Preview -
-
- @endforeach - @endif - -
- Keterangan - - {{ $detail->keterangan ?? '' }} -
-
+ @endforeach
- @endforeach -
-@if (!isset($status)) + @if (!isset($status))
@include('lpj::component.history-permohonan') @endif diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index c9ec9ba..c17020b 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -102,6 +102,23 @@
+ @if(isset($detail->details)) + @if(json_decode($detail->details)) + @foreach (json_decode($detail->details) as $key => $value) +
+ + {{ str_replace("_"," ",$key) ?? "" }} + +

+ {{ $value ?? "" }} +

+
+
+
+ @endforeach + @endif + @endif +
keterangan