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
             </h3>
         </div>
-@endif
-<div data-accordion="true">
-    @foreach ($permohonan->debiture->documents as $dokumen)
-        <div class="accordion-item {{ count($permohonan->debiture->documents) == 1 ? 'active' : '' }} [&:not(:last-child)]:border-b border-b-gray-200"
-            data-accordion-item="true" id="accordion_detail_jaminan">
-            <button @class(['accordion-toggle py-4 group', 'mx-8' => !isset($status)])"
-                data-accordion-toggle="#accordion_detail_jaminan_{{ $loop->index }}">
-                <span class="text-base text-gray-900 font-medium">
+        @endif
+        <div data-accordion="true">
+            @foreach ($permohonan->debiture->documents as $dokumen)
+                <div class="accordion-item {{ count($permohonan->debiture->documents) == 1 ? 'active' : '' }} [&:not(:last-child)]:border-b border-b-gray-200"
+                     data-accordion-item="true" id="accordion_detail_jaminan">
+                    <button @class(['accordion-toggle py-4 group', 'mx-8' => !isset($status)])"
+                    data-accordion-toggle="#accordion_detail_jaminan_{{ $loop->index }}">
+                    <span class="text-base text-gray-900 font-medium">
                     @if (count($permohonan->debiture->documents) > 1)
-                        Jaminan {{ $loop->index + 1 }}
-                    @else
-                        Jaminan
-                    @endif
+                            Jaminan {{ $loop->index + 1 }}
+                        @else
+                            Jaminan
+                        @endif
                 </span>
-                <i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
-                </i>
-                <i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
-                </i>
-            </button>
-            <div class="accordion-content {{ count($permohonan->debiture->documents) > 1 ? 'hidden' : '' }}"
-                id="accordion_detail_jaminan_{{ $loop->index }}">
+                    <i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
+                    </i>
+                    <i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
+                    </i>
+                    </button>
+                    <div class="accordion-content {{ count($permohonan->debiture->documents) > 1 ? 'hidden' : '' }}"
+                         id="accordion_detail_jaminan_{{ $loop->index }}">
 
-                @if (!isset($status))
-                    <div class="card-body lg:py-7.5 grid grid-cols-2">
-                        <div class="mb-5">
-                            <h3 class="text-md font-medium text-gray-900">
-                                Pemilik Jaminan:
-                            </h3>
-                            <span class="text-2sm text-gray-700">
+                        @if (!isset($status))
+                            <div class="card-body lg:py-7.5 grid grid-cols-2">
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
                                 {{ $dokumen->pemilik->name ?? '' }}
                             </span>
-                        </div>
-                        <div class="mb-5">
-                            <h3 class="text-md font-medium text-gray-900">
-                                Jenis Jaminan:
-                            </h3>
-                            <span class="text-2sm text-gray-700">
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Jenis Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
                                 {{ $dokumen->jenisJaminan->name ?? '' }}
                             </span>
-                        </div>
-                        <div class="mb-5">
-                            <h3 class="text-md font-medium text-gray-900">
-                                Hubungan Pemilik Jaminan:
-                            </h3>
-                            <span class="text-2sm text-gray-700">
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Hubungan Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
                                 {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }}
                             </span>
-                        </div>
-                        <div class="mb-5">
-                            <h3 class="text-md font-medium text-gray-900">
-                                Alamat Pemilik Jaminan:
-                            </h3>
-                            <span class="text-2sm text-gray-700">
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Alamat Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
                                 {{ $dokumen->pemilik->address ?? '' }},
                                 <br> {{ $dokumen->pemilik->village->name ?? '' }},
                                 {{ $dokumen->pemilik->district->name ?? '' }},
@@ -243,80 +243,94 @@
                                 {{ $dokumen->pemilik->province->name ?? '' }} -
                                 {{ $dokumen->pemilik->village->postal_code ?? '' }}
                             </span>
+                                </div>
+                            </div>
+                        @endif
+                        <div class="card-table scrollable-x-auto pb-3">
+                            <a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}"
+                               class="ml-6 btn btn-dark dark:btn-light">
+                                <i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen
+                            </a>
+                            <table class="table align-middle text-sm text-gray-500">
+                                @foreach ($dokumen->detail as $detail)
+                                    <tr>
+                                        <td class="py-2 text-gray-600 font-normal max-w-[100px]">
+                                            {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+                                        </td>
+                                        <td class="py-2 text-gray-800 font-normal text-2sm">
+                                            {{ $detail->name ?? '' }}
+                                        </td>
+                                    </tr>
+                                    @if(isset($detail->details))
+                                        @if(json_decode($detail->details))
+                                            @foreach (json_decode($detail->details) as $key => $value)
+                                                <tr>
+                                                    <td class="py-3 capitalize">
+                                                        {{ str_replace("_"," ",$key) ?? "" }}
+                                                    </td>
+                                                    <td class="py-2 text-gray-800 font-normal text-2sm">
+                                                        {{ $value ?? "" }}
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        @endif
+                                    @endif
+                                    <tr>
+                                        <td class="py-3  max-w-[100px] align-top">
+                                            Dokumen Jaminan
+                                        </td>
+                                        <td class="py-3 text-gray-700 text-2sm font-normal">
+
+                                            @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)
+                                                    <div class="flex w-full lg:w-[30%]">
+                                                        @if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo']))
+                                                            @if (!empty($dokumen_nomor))
+                                                                <span class="flex-1 mt-2 text-info">Nomor Dokumen :
+                                                            {{ $dokumen_nomor[$index] }}</span>
+                                                            @endif
+                                                            <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                                                                {{ basename($dokumen) }}
+                                                                <i class="ki-filled ki-cloud-download"></i>
+                                                            </a>
+                                                        @endif
+                                                        <span class="flex-none badge badge-sm badge-outline badge-warning mt-2"
+                                                              onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i
+                                                                class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                                    </div>
+                                                    <br>
+                                                @endforeach
+                                            @endif
+
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td class="py-3  max-w-[100px]">
+                                            Keterangan
+                                        </td>
+                                        <td class="py-3 text-gray-700 text-2sm font-normal">
+                                            {{ $detail->keterangan ?? '' }}
+                                        </td>
+                                    </tr>
+                                @endforeach
+                            </table>
                         </div>
                     </div>
-                @endif
-                <div class="card-table scrollable-x-auto pb-3">
-                    <a href="{{ route('debitur.jaminan.bulk.download', ['id' => $permohonan->debiture->id, 'jaminan' => $dokumen->id]) }}"
-                        class="ml-6 btn btn-dark dark:btn-light">
-                        <i class="ki-outline ki-cloud-download"></i> Download Semua Dokumen
-                    </a>
-                    <table class="table align-middle text-sm text-gray-500">
-                        @foreach ($dokumen->detail as $detail)
-                            <tr>
-                                <td class="py-2 text-gray-600 font-normal max-w-[100px]">
-                                    {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
-                                </td>
-                                <td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $detail->name ?? '' }}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="py-3  max-w-[100px] align-top">
-                                    Dokumen Jaminan
-                                </td>
-                                <td class="py-3 text-gray-700 text-2sm font-normal">
-
-                                    @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)
-                                            <div class="flex w-full lg:w-[30%]">
-                                                @if (in_array(Auth::user()->roles[0]->name, ['administrator', 'pemohon-eo']))
-                                                    @if (!empty($dokumen_nomor))
-                                                        <span class="flex-1 mt-2 text-info">Nomor Dokumen :
-                                                            {{ $dokumen_nomor[$index] }}</span>
-                                                    @endif
-                                                    <a href="{{ route('debitur.jaminan.download', ['id' => $permohonan->debiture->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                                        class="flex-none badge badge-sm badge-outline mt-2 mr-2">
-                                                        {{ basename($dokumen) }}
-                                                        <i class="ki-filled ki-cloud-download"></i>
-                                                    </a>
-                                                @endif
-                                                <span class="flex-none badge badge-sm badge-outline badge-warning mt-2"
-                                                    onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i
-                                                        class="ki-filled ki-eye mr-2"></i>Preview</span>
-                                            </div>
-                                            <br>
-                                        @endforeach
-                                    @endif
-
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="py-3  max-w-[100px]">
-                                    Keterangan
-                                </td>
-                                <td class="py-3 text-gray-700 text-2sm font-normal">
-                                    {{ $detail->keterangan ?? '' }}
-                                </td>
-                            </tr>
-                        @endforeach
-                    </table>
                 </div>
-            </div>
+            @endforeach
         </div>
-    @endforeach
-</div>
-@if (!isset($status))
+        @if (!isset($status))
     </div>
     @include('lpj::component.history-permohonan')
 @endif
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) }}
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input" type="text" name="custom_field[][$detail->jenisLegalitasJaminan->custom_field]" value="{{ $custom_field[$detail->jenisLegalitasJaminan->custom_field] ?? '' }}">
+                                <input class="input" type="text" name="custom_field[][{{$detail->jenisLegalitasJaminan->custom_field}}]" value="{{ $custom_field[$detail->jenisLegalitasJaminan->custom_field] ?? '' }}">
                             </div>
                         </div>
                     @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 @@
                     </div>
                     <div class="border-t border-gray-300 border-dashed">
                     </div>
+                    @if(isset($detail->details))
+                        @if(json_decode($detail->details))
+                            @foreach (json_decode($detail->details) as $key => $value)
+                                <div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
+                                    <span class="text-2xs text-gray-600 uppercase pl-3">
+                                         {{ str_replace("_"," ",$key) ?? "" }}
+                                    </span>
+                                    <p class="text-2xs text-gray-600 text-right max-w-[250px]">
+                                        {{ $value ?? "" }}
+                                    </p>
+                                </div>
+                                <div class="border-t border-gray-300 border-dashed">
+                                </div>
+                            @endforeach
+                        @endif
+                    @endif
+
                     <div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
                         <span class="text-2xs text-gray-600 uppercase pl-3">
                             keterangan