diff --git a/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php b/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php
index 0784786..0926097 100644
--- a/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php
+++ b/app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php
@@ -97,11 +97,11 @@ class LaporanHasilPenilaianJaminanInternalExternalExport implements FromCollecti
             $permohonan->nomor_registrasi,
             $permohonan->tanggal_permohonan ?? '',
             $permohonan->debiture->branch->name ?? '',
-            $permohonan->creator->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
             $permohonan->debiture->cif ?? '',
             $permohonan->debiture->name ?? '',
-            $permohonan->jenisPenilaian->name ?? '',
             $permohonan->tujuanPenilaian->name,
+            $permohonan->jenisPenilaian->name ?? '',
             $permohonan->jenisFasilitasKredit->name,
             $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
             $permohonan->documents->map(function ($document) {
@@ -139,7 +139,7 @@ class LaporanHasilPenilaianJaminanInternalExternalExport implements FromCollecti
     ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
     : '',
             $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
-            $permohonan->penilaian->teams ?? '',
+            $permohonan->approveSo->name ?? '',
             '', // saran
             ''  // catatan
         ];
diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php
index eda029b..571b58b 100644
--- a/resources/views/activity/index.blade.php
+++ b/resources/views/activity/index.blade.php
@@ -208,11 +208,11 @@
                     title: 'Tanggal Permohonan'
                 },
                 user_id: {
-                    title: 'User Pemohon',
-                    render: (item, data) => {
-                        return data.user && data.user.name ? `${data.user.name}` : '-';
-                    },
-                },
+            title: 'User Pemohon',
+            render: (item, data) => {
+                return data?.user?.name ?? data?.mig_nama_ao ?? '-';
+            }},
+
 
                 branch_id: {
                     title: 'Cabang Pemohon',
@@ -264,7 +264,7 @@
     title: 'Action',
     render: (item, data) => {
         const status = data.status; // Anggap status berada di dalam objek data
-        const dokumenjaminan = data.dokumenjaminan || []; 
+        const dokumenjaminan = data.dokumenjaminan || [];
 
         return `
             <div class="flex flex-nowrap justify-center">
@@ -287,7 +287,7 @@
 },
             }
 
-               
+
         };
 
         let dataTable = new KTDataTable(element, dataTableOptions);
diff --git a/resources/views/component/detail-lokasi.blade.php b/resources/views/component/detail-lokasi.blade.php
new file mode 100644
index 0000000..ddfa002
--- /dev/null
+++ b/resources/views/component/detail-lokasi.blade.php
@@ -0,0 +1,24 @@
+@if (is_array($details) && count($details) > 0)
+    @foreach ($details as $value)
+        @foreach ($value as $key => $item)
+            @if (!empty($item))
+                <tr>
+                    <td style="padding: 2px; width:25%;">
+                        {{ formatLabel($key) }}
+                    </td>
+                    <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
+                    <td style="padding: 2px;">
+                        @if (strpos(strtolower($key), 'tanggal') !== false)
+                            {{ formatTanggalIndonesia($item) }}
+                        @else
+                            {{ $item }}
+                            @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                <span>m²</span>
+                            @endif
+                        @endif
+                    </td>
+                </tr>
+            @endif
+        @endforeach
+    @endforeach
+@endif
diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 1b7848a..ad76e50 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -1,41 +1,16 @@
 @if (@isset($dokumen))
     @foreach ($dokumen->detail as $detail)
-        @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
+        {{-- @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
             <tr>
                 <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
             </tr>
-        @endif
-
-        @if (isset($detail->details))
-            @php
-                $details = json_decode($detail->details, true);
-            @endphp
-
-            @if (is_array($details) && count($details) > 0)
-                @foreach ($details as $value)
-                    @if (is_array($value))
-                        @foreach ($value as $key => $item)
-                            @if (!empty($item))
-                                <tr>
-                                    <td style="padding: 2px;" style="width:25%;">
-                                        {{ formatLabel($key) }}
-                                    </td>
-                                    <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
-                                    <td style="padding: 2px;">
-                                        @if (strpos(strtolower($key), 'tanggal') !== false)
-                                            {{ formatTanggalIndonesia($item) }}
-                                        @else
-                                            {{ $item }}
-                                            @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                            <span>m²</span>
-                                            @endif
-                                        @endif
-                                    </td>
-                                </tr>
-                            @endif
-                        @endforeach
-                    @endif
-                @endforeach
+        @endif --}}
+        @if ($detail->name != 'LOKASI JAMINAN')
+            @if (isset($detail->details))
+                @php
+                    $details = json_decode($detail->details, true);
+                @endphp
+                @include('lpj::component.detail-lokasi', ['details' => $details])
             @endif
         @endif
     @endforeach
diff --git a/resources/views/laporan-penilai-jaminan/index.blade.php b/resources/views/laporan-penilai-jaminan/index.blade.php
index c378220..0803266 100644
--- a/resources/views/laporan-penilai-jaminan/index.blade.php
+++ b/resources/views/laporan-penilai-jaminan/index.blade.php
@@ -245,8 +245,8 @@
                 user_id: {
                     title: 'User Pemohon',
                     render: (item, data) => {
-                        return data.user && data.user.name ? `${data.user.name}` : '-';
-                    },
+                        return data?.user?.name ?? data?.mig_nama_ao ?? '-';
+                    }
                 },
                 debitur_id: {
                     title: 'Debitur',
diff --git a/resources/views/penilai/components/analisa/fakta.blade.php b/resources/views/penilai/components/analisa/fakta.blade.php
index c9088cb..b5d4add 100644
--- a/resources/views/penilai/components/analisa/fakta.blade.php
+++ b/resources/views/penilai/components/analisa/fakta.blade.php
@@ -1,4 +1,4 @@
-<div class="no-break">
+{{-- <div class="no-break"> --}}
 <table class="judul"  style="width: 100%; ">
     <tr>
         <td style="width: 100%; border: 1px solid #000; text-align: center;">
@@ -63,7 +63,7 @@
         </tr>
     @endif
 
-    @if (!empty($forminspeksi['fakta']['batas_batas_input']))
+    @if (!empty($forminspeksi['fakta']['batas_batas_input']) && count($forminspeksi['fakta']['batas_batas_input']) > 0)
         <tr>
             <td width="25%" style="vertical-align: top;">Batas batas</td>
             <td width="1%" style="vertical-align: top;">:</td>
@@ -103,4 +103,4 @@
 
 
 </table>
-</div>
+{{-- </div> --}}
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index d1fa89e..6565c5a 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -19,6 +19,7 @@
                 </td>
             </tr>
         </table>
+        @if ($inspeksi->is_mig != 1)
         <table style="width: 100%; ">
             <tr>
                 <td style="border: 1px solid #000; text-align: center;">
@@ -79,9 +80,8 @@
                 @endforeach
             </table>
         </div>
-
-
         <div class="page-break"></div>
+        @endif
         <table style="width: 100%; ">
             <tr>
                 <td style="border: 1px solid #000; text-align: center;">
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 656e7d8..ed0172f 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -142,6 +142,25 @@
                         <td style=" padding: 2px; vertical-align: top;">{{ $permohonan->tujuanPenilaian->name ?? '' }}
                         </td>
                     </tr>
+                    @if ($permohonan->is_mig == 1)
+        {{-- <table style="width: 100%; "> --}}
+            @if (@isset($dokumen))
+            @foreach ($dokumen->detail as $detail)
+                @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
+                    <tr>
+                        <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                    </tr>
+                @endif
+
+                @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
+                    @php
+                        $details = json_decode($detail->details, true);
+                    @endphp
+                    @include('lpj::component.detail-lokasi', ['details' => $details])
+                @endif
+            @endforeach
+        @endif
+        @else
                     <tr>
                         <td style=" padding: 2px; vertical-align: top;">Terletak di</td>
                         <td style=" padding: 2px; vertical-align: top;">:</td>
@@ -168,6 +187,7 @@
                         <td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td>
                     </tr>
 
+                    @endif
                     @include('lpj::component.print-out-dokument')
 
                     @if (isset($forminspeksi['asset']['nomor_nib']))
@@ -1021,7 +1041,7 @@
                         </td>
                         @if ($permohonan->approval_so != null)
                             <td style=" padding: 4px;">
-                                {{ $senior_officer->name ?? '' }}</br>
+                                {{ $soUser->name ?? '' }}</br>
                                 <span>
                                     {{ ucwords(strtolower('SENIOR OFFICER')) }}
                                 </span>
@@ -1031,7 +1051,7 @@
 
                         @if ($permohonan->approval_eo != null)
                             <td style=" padding: 4px;">
-                                {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                                {{ $eoUser->name ?? '' }}</br>
                                 <span>
                                     {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
                                 </span>
@@ -1039,7 +1059,7 @@
                         @endif
                         @if ($permohonan->approval_dd != null)
                             <td style=" padding: 4px;">
-                                {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                                {{ $ddUser->name ?? '' }}</br>
                                 <span>
                                     {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
                                 </span>
diff --git a/resources/views/penilai/components/print-out-standar.blade.php b/resources/views/penilai/components/print-out-standar.blade.php
index 0e4172c..3d1e140 100644
--- a/resources/views/penilai/components/print-out-standar.blade.php
+++ b/resources/views/penilai/components/print-out-standar.blade.php
@@ -64,7 +64,7 @@
                     <tr>
                         <td style="width: 25%; padding: 2px;">Ao</td>
                         <td style="width: 1%;  padding: 2px;">:</td>
-                        <td style="vertical-align: top;  padding: 2px;">{{ $permohonan->user->name ?? '' }}</td>
+                        <td style="vertical-align: top;  padding: 2px;">{{ $permohonan->user->name ??  $permohonan->mig_nama_ao ?? '' }}</td>
                     </tr>
                 </table>
             </td>
@@ -106,7 +106,7 @@
             <tr>
                 <td style="width: 25%; padding: 2px; vertical-align: top;">Debitur / Wakil Debitur</td>
                 <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $permohonan->debiture->name ?? '' }}
+                <td>{{  $forminspeksi['asset']['debitur_perwakilan'] ??$permohonan->debiture->name ?? '' }}
                 </td>
             </tr>
             <tr>
@@ -126,6 +126,26 @@
                 </td>
             </tr>
         </table>
+        @if ($permohonan->is_mig == 1)
+        <table style="width: 100%; ">
+            @if (@isset($dokumen))
+            @foreach ($dokumen->detail as $detail)
+                @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
+                    <tr>
+                        <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                    </tr>
+                @endif
+
+                @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
+                    @php
+                        $details = json_decode($detail->details, true);
+                    @endphp
+                    @include('lpj::component.detail-lokasi', ['details' => $details])
+                @endif
+            @endforeach
+        @endif
+    </table>
+        @else
         <table style="width: 100%; ">
             <tr>
                 <td width="25%">Terletak di</td>
@@ -153,6 +173,7 @@
                 <td>{{ $alamat['province_code'] ?? '' }}</td>
             </tr>
         </table>
+        @endif
     </div>
 
     {{-- <div class="no-break"> --}}
@@ -437,7 +458,7 @@
                 </td>
                 @if ($permohonan->approval_so != null)
                     <td style=" padding: 4px;">
-                        {{ $senior_officer->name ?? '' }}</br>
+                        {{ $soUser->name ?? '' }}</br>
                         <span>
                             {{ ucwords(strtolower('SENIOR OFFICER')) }}
                         </span>
@@ -447,7 +468,7 @@
 
                 @if ($permohonan->approval_eo != null)
                     <td style=" padding: 4px;">
-                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                        {{ $eoUser->name ?? '' }}</br>
                         <span>
                             {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
                         </span>
@@ -455,7 +476,7 @@
                 @endif
                 @if ($permohonan->approval_dd != null)
                     <td style=" padding: 4px;">
-                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                        {{ $ddUser->name ?? '' }}</br>
                         <span>
                             {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
                         </span>
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index f6df6be..c17f56a 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -155,11 +155,11 @@
                     },
                 },
                 user_id: {
-                    title: 'User Pemohon',
-                    render: (item, data) => {
-                        return `${data?.user?.name || '-'}`;
-                    },
-                },
+            title: 'User Pemohon',
+            render: (item, data) => {
+                return data?.user?.name ?? data?.mig_nama_ao ?? '-';
+            }},
+
                 branch_id: {
                     title: 'Cabang Pemohon',
                     render: (item, data) => {
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index d224a9f..1396e69 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -343,10 +343,34 @@
                 </td>
             </tr>
 
+
+
             <tr>
                 <td style="width: 25%; padding: 2px; vertical-align: top;">Alamat</td>
                 <td style="width: 1%; vertical-align: top;">:</td>
                 <td style="vertical-align: top;">
+
+
+            @if ($permohonan->is_mig == 1)
+            <table style="margin: 0">
+                @if (@isset($dokumen))
+                @foreach ($dokumen->detail as $detail)
+                    @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
+                        <tr>
+                            <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
+                        </tr>
+                    @endif
+
+                    @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
+                        @php
+                            $details = json_decode($detail->details, true);
+                        @endphp
+                        @include('lpj::component.detail-lokasi', ['details' => $details])
+                    @endif
+                @endforeach
+            @endif
+        </table>
+            @else
                     <table style="margin: 0">
                         <tr>
                             <td width="25%">Terletak di</td>
@@ -369,8 +393,10 @@
                             <td>{{ $alamat['province_code'] ?? '' }}</td>
                         </tr>
                     </table>
+                    @endif
                 </td>
             </tr>
+
         </table>
 
         <table