diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 8908860..994520b 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -175,7 +175,7 @@ use Illuminate\Support\Facades\Auth;
                                         ->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name',
                                                  'dokumen_jaminan.address as dokumen_jaminan_address');
 
-            $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first();
+            $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan.detail'])->first();
 
             if($penawaran->detail_penawaran_tgl_proposal)
                 $penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y');
diff --git a/resources/views/penawaran/edit.blade.php b/resources/views/penawaran/edit.blade.php
index f67ec55..61ac3b2 100644
--- a/resources/views/penawaran/edit.blade.php
+++ b/resources/views/penawaran/edit.blade.php
@@ -91,7 +91,10 @@
                                     @if ($row->status == 1)
                                         <option value="{{ $row->id }}"
                                             {{ in_array($row->id, old('kjpp', $kjpps ?? [])) ? 'selected' : '' }}>
-                                            {{ $row->name }}
+                                            {{ $row->name }} | {{ $row->jenis_kantor }}
+                                            @if($row->jenis_kantor == 'Kantor Cabang')
+                                                {{ str_replace(['KOTA','KAB.','KAB'],'',$row->city->name) }}
+                                            @endif
                                         </option>
                                     @endif
                                 @endforeach
diff --git a/resources/views/spk/documentSPK.blade.php b/resources/views/spk/documentSPK.blade.php
index 08460ad..76bd9e8 100644
--- a/resources/views/spk/documentSPK.blade.php
+++ b/resources/views/spk/documentSPK.blade.php
@@ -90,9 +90,9 @@
                 </tr>
                 @php
                     $i=1;
-                    $totalAsset = count($data->debiture->documents);
+                   $totalAsset = count($data->dokumenjaminan);
                 @endphp
-                @foreach ($data->debiture->documents as $dokumen)
+                @foreach ($data->dokumenjaminan as $dokumen)
                     <tr valign="top">
                         <td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td>
                         <td>:</td>
@@ -125,21 +125,26 @@
                                         @if(!$shouldExclude)
                                             @php $details = $dokumen_jaminans->detail; @endphp
                                             @foreach ($details as $index => $detail)
-                                                @php
-                                                    $shouldExcludeNomor = false;
-                                                    foreach ($excludedDocuments as $excludedDoc) {
-                                                        if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) {
-                                                            $shouldExcludeNomor = true;
-                                                            break;
+                                                @if($detail->dokumen_jaminan)
+                                                    {{ $detail->name }}
+                                                    @php
+                                                        $shouldExcludeNomor = false;
+                                                        foreach ($excludedDocuments as $excludedDoc) {
+                                                            if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) {
+                                                                $shouldExcludeNomor = true;
+                                                                break;
+                                                            }
                                                         }
-                                                    }
-                                                @endphp
-                                                @if(!$shouldExcludeNomor)
-                                                    @if($detail->dokumen_nomor)
-                                                        @foreach(json_decode($detail->dokumen_nomor) as $item)
-                                                            {{ $item }}<br>
-                                                        @endforeach
+                                                    @endphp
+                                                    @if(!$shouldExcludeNomor)
+                                                        @if($detail->dokumen_nomor)
+                                                            {{ " | " }}
+                                                            @foreach(json_decode($detail->dokumen_nomor) as $key => $item)
+                                                                {{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }}
+                                                            @endforeach
+                                                        @endif
                                                     @endif
+                                                    <br>
                                                 @endif
                                             @endforeach
                                         @endif
diff --git a/resources/views/spk/edit.blade.php b/resources/views/spk/edit.blade.php
index 0f9f699..9b768ae 100644
--- a/resources/views/spk/edit.blade.php
+++ b/resources/views/spk/edit.blade.php
@@ -106,10 +106,9 @@
                             </tr>
                             @php
                                 $i=1;
-                                $totalAsset = count($data->debiture->documents);
+                                $totalAsset = count($data->dokumenjaminan);
                             @endphp
-
-                            @foreach ($data->debiture->documents as $dokumen)
+                            @foreach ($data->dokumenjaminan as $dokumen)
                                 <tr valign="top">
                                     <td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td>
                                     <td>:</td>
@@ -127,7 +126,7 @@
                                 @endphp
 
                                 @foreach ($data->dokumenjaminan as $dokumen_jaminans)
-                                    @if ($dokumen->id== $dokumen_jaminans->id)
+                                    @if ($dokumen->id == $dokumen_jaminans->id)
                                         @php
                                             $shouldExclude = false;
                                             $shouldExcludeNomor = false;
@@ -142,6 +141,8 @@
                                         @if(!$shouldExclude)
                                             @php $details = $dokumen_jaminans->detail; @endphp
                                             @foreach ($details as $index => $detail)
+                                                @if($detail->dokumen_jaminan)
+                                                {{ $detail->name }}
                                                 @php
                                                     $shouldExcludeNomor = false;
                                                     foreach ($excludedDocuments as $excludedDoc) {
@@ -153,11 +154,14 @@
                                                 @endphp
                                                 @if(!$shouldExcludeNomor)
                                                     @if($detail->dokumen_nomor)
-                                                        @foreach(json_decode($detail->dokumen_nomor) as $item)
-                                                            {{ $item }}<br>
+                                                        {{ " | " }}
+                                                        @foreach(json_decode($detail->dokumen_nomor) as $key => $item)
+                                                            {{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }}
                                                         @endforeach
                                                     @endif
                                                 @endif
+                                                <br>
+                                                @endif
                                             @endforeach
                                         @endif
                                     @endif