diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 0855bb3..18d5a4b 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -46,8 +46,8 @@ function checkActiveDateRangePenawaran($id)
 
     $start_date = strtotime($penawaran->start_date);
     $end_date   = strtotime($penawaran->end_date);
-    // $todays_date = strtotime(now());
-    $todays_date = strtotime("+1 day", strtotime(now()));
+    $todays_date = strtotime(now());
+    //$todays_date = strtotime("+1 day", strtotime(now()));
 
     $allow = true;
     if ($todays_date >= $start_date && $todays_date <= $end_date) {
@@ -485,7 +485,7 @@ function calculateSLA($permohonan, $type)
      * @param int $jenisLegalitas
      * @return int
      */
-function calculateTotalLuas($detailsArray, $key, $jenisLegalitas)
+function calculateTotalLuas($detailsArray, $key, $jenisLegalitas, $defaultJenisLegalitas)
 {
     $total = 0;
 
@@ -503,7 +503,57 @@ function calculateTotalLuas($detailsArray, $key, $jenisLegalitas)
                 }
             }
         }
+
+        // Jika total masih 0, gunakan jenis jaminan ppjb
+        if ($total === 0) {
+            foreach ($detailsArray as $item) {
+                if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $defaultJenisLegalitas) {
+                    $details = json_decode($item->details, true);
+
+                    if (is_array($details)) {
+                        foreach ($details as $detail) {
+                            if (isset($detail[$key]) && $detail[$key] !== null) {
+                                $total += (int) $detail[$key];
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // jika total masih kosong juga maka gunakan ppb
+        if ($total === 0 && $fallbackJenisLegalitas !== null) {
+            foreach ($detailsArray as $item) {
+                if (isset($item->jenis_legalitas_jaminan_id) && $item->jenis_legalitas_jaminan_id === $fallbackJenisLegalitas) {
+                    $details = json_decode($item->details, true);
+
+                    if (is_array($details)) {
+                        foreach ($details as $detail) {
+                            if (isset($detail[$key]) && $detail[$key] !== null) {
+                                $total += (int) $detail[$key];
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    return $total;
+    return $total > 0 ? $total : 0;
+}
+
+
+function ubahNomorHp($nomorHp) {
+
+    $nomorHp = preg_replace('/\D/', '', $nomorHp);
+    if (strpos($nomorHp, '62') === 0) {
+        $nomorBaru = substr($nomorHp, 0, 5) . "xxxxx";
+        return '+' . $nomorBaru;
+    } elseif (strpos($nomorHp, '0') === 0) {
+
+        $nomorBaru = substr($nomorHp, 0, 5) . "xxxxxx";
+        return $nomorBaru;
+    } else {
+        return "Nomor HP tidak valid";
+    }
 }
diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php
index d7bd597..f12ae72 100644
--- a/app/Http/Controllers/DokumenJaminanController.php
+++ b/app/Http/Controllers/DokumenJaminanController.php
@@ -9,6 +9,7 @@
     use Illuminate\Support\Collection;
     use Illuminate\Support\Facades\DB;
     use Illuminate\Support\Facades\Storage;
+    use Illuminate\Http\UploadedFile;
     use Log;
     use Modules\Location\Models\City;
     use Modules\Location\Models\District;
@@ -249,7 +250,7 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
-                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
+                                'details' => isset($request->custom_field[$key]) ? json_encode(array_values($request->custom_field[$key])) : ''
                             ];
 
                             $dokumenJaminan = [];
@@ -279,7 +280,6 @@
                             }
 
 
-
                             // Setelah loop, periksa apakah ada dokumen yang dihapus
                             $existingDetail = $existingDetails->get($request->detail_dokumen_jaminan_id[$key] ?? null);
 
@@ -287,32 +287,69 @@
                                 $existingDokumen = json_decode($existingDetail->dokumen_jaminan, true) ?? [];
                                 $existingNomor = json_decode($existingDetail->dokumen_nomor, true) ?? [];
 
+                                $newDokumenJaminan = [];
+                                $newDokumenNomor = [];
 
+                                $allFilesDeleted = true;
 
-                                // Jika jumlah dokumen berkurang, berarti ada yang dihapus
-                                if (count($existingDokumen) > count($dokumenJaminan)) {
-                                    $dokumenJaminan = $existingDokumen;
-                                    $dokumenNomor = $existingNomor;
-                                    foreach ($request->dokumen_jaminan[$key] as $index => $file) {
-                                        if ($file === null) {
-                                            // Hapus dokumen yang tidak ada lagi
-                                            unset($dokumenJaminan[$index]);
-                                            unset($dokumenNomor[$index]);
+                                foreach ($existingDokumen as $index => $existingFile) {
+                                    if (isset($request->dokumen_jaminan[$key][$index])) {
+                                        $allFilesDeleted = false;
+                                        $file = $request->dokumen_jaminan[$key][$index];
+                                        if ($file instanceof \Illuminate\Http\UploadedFile) {
+                                            // File baru diupload
+                                            $file_name = $file->getClientOriginalName();
+                                            $file->storeAs('public/jaminan/' . $debitur->id . '/' . $document->id . '/', $file_name);
+                                            $newDokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
                                         } elseif (is_string($file) && !empty($file)) {
-                                            // Update nomor dokumen untuk file yang tidak diubah
-                                            $dokumenNomor[$index] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                            // File tidak diubah
+                                            $newDokumenJaminan[] = $existingFile;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? $existingNomor[$index];
+                                        }
+                                    } else {
+                                        // File dihapus, hapus dari storage jika ada
+                                        if (Storage::exists('public/' . $existingFile)) {
+                                            Storage::delete('public/' . $existingFile);
                                         }
                                     }
-                                    // Reset array keys
-                                    $dokumenJaminan = array_values($dokumenJaminan);
-                                    $dokumenNomor = array_values($dokumenNomor);
+                                }
+
+                                // Tambahkan file baru yang mungkin ditambahkan
+                                foreach ($request->dokumen_jaminan[$key] ?? [] as $index => $file) {
+                                    if ($file instanceof UploadedFile) {
+                                        $allFilesDeleted = false;
+                                        $file_name = $file->getClientOriginalName();
+                                        $path = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        if (!in_array($path, $newDokumenJaminan)) {
+                                            $file->storeAs('public/' . dirname($path), $file_name);
+                                            $newDokumenJaminan[] = $path;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                        }
+                                    } elseif (is_string($file) && !empty($file) && !in_array($file, $newDokumenJaminan)) {
+                                        $allFilesDeleted = false;
+                                        $newDokumenJaminan[] = $file;
+                                        $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                    }
+                                }
+
+                                if ($allFilesDeleted) {
+                                    $dokumenJaminan = [];
+                                    $dokumenNomor = [];
+                                } else {
+                                    $dokumenJaminan = $newDokumenJaminan;
+                                    $dokumenNomor = $newDokumenNomor;
                                 }
                             }
 
 
+
                             if (!empty($dokumenJaminan)) {
                                 $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
                                 $detailData['dokumen_nomor'] = json_encode($dokumenNomor);
+                            } else if(empty($dokumenJaminan)){
+                                $detailData['dokumen_jaminan'] = null;
+                                $detailData['dokumen_nomor'] = null;
                             }
 
                             if (isset($request->detail_dokumen_jaminan_id[$key])) {
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 5d32d87..8eb6ead 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -144,10 +144,10 @@ class PenilaiController extends Controller
             }
         }
 
-        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
+        return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
     }
 
-    public function standard(Request $request, $id)
+    public function standar(Request $request, $id)
     {
 
         $documentId = $request->query('documentId');
@@ -167,7 +167,7 @@ class PenilaiController extends Controller
                 'inspeksi_id' => $inspeksiId,
             ],
             [
-                'type_penilai' => 'standard',
+                'type_penilai' => 'standar',
             ]
         );
 
@@ -212,7 +212,7 @@ class PenilaiController extends Controller
             }
         }
 
-        return view('lpj::penilai.components.lpj-sederhana-standard', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
+        return view('lpj::penilai.components.lpj-sederhana-standar', compact('permohonan', 'forminspeksi', 'basicData', 'inspeksi', 'lpjData', 'provinces', 'cekAlamat', 'cities', 'districts', 'villages'));
     }
 
     public function resume(Request $request)
@@ -570,7 +570,7 @@ class PenilaiController extends Controller
             });
         }
 
-        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan']);
+        $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?, ?, ?, ?, ?, ?)', ['assign', 'survey-completed', 'proses-laporan', 'paparan', 'proses-paparan', 'paparan', 'revisi-laporan', 'revisi-paparan', 'request-freeze', 'freeze', 'reject-freeze','unfreeze-sla']);
 
         if (!Auth::user()->hasRole('administrator')) {
             $query->whereHas('penilaian.userPenilai', function ($q) {
@@ -963,41 +963,6 @@ class PenilaiController extends Controller
     }
 
 
-    public function storeMemo(Request $request)
-    {
-        try {
-
-            $validatedData = $request->validate([
-                'permohonan_id' => 'required|integer',
-                'document_id' => 'required|integer',
-                'inspeksi_id' => 'required|integer',
-                'memo' => 'required',
-            ]);
-            Penilai::updateOrCreate(
-                [
-                    'permohonan_id' => $validatedData['permohonan_id'],
-                    'dokument_id' => $validatedData['document_id'],
-                    'inspeksi_id' => $validatedData['inspeksi_id'],
-                ],
-                [
-                    'memo' => json_encode($validatedData['memo']),
-                ]
-            );
-
-
-            return response()->json([
-                'success' => true,
-                'message' => 'Berhasil saved memo'
-            ], 200);
-        } catch (\Exception $e) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan',
-                'error' => $e->getMessage()
-            ], 500);
-        }
-    }
-
     public function storeMemoWithPhotos(Request $request)
     {
         try {
@@ -1021,6 +986,8 @@ class PenilaiController extends Controller
                 ]
             );
 
+            $existingPhotos = isset($memo->memo) ? json_decode($memo->memo)->foto : [];
+            dd($existingPhotos);
             // Simpan foto-foto
             if ($request->hasFile('foto_0')) {
                 $photoUrls = [];
@@ -1033,11 +1000,15 @@ class PenilaiController extends Controller
                     $index++;
                 }
 
-                // Tambahkan URL foto ke data memo
-                $memoData['foto'] = $photoUrls;
-                $memo->memo       = json_encode($memoData);
-                $memo->save();
+                $memoData['foto'] = array_merge($existingPhotos, $photoUrls);
+
+            }else{
+                $memoData['foto'] = $existingPhotos;
             }
+            // Tambahkan URL foto ke data memo
+            $memoData['foto'] = $photoUrls;
+            $memo->memo       = json_encode($memoData);
+            $memo->save();
 
             return response()->json([
                 'success' => true,
@@ -1387,7 +1358,7 @@ class PenilaiController extends Controller
     {
         $viewMap = [
             'sederhana' => 'penilai.components.print-out-sederhana',
-            'standard' => 'penilai.components.print-out-standard',
+            'standar' => 'penilai.components.print-out-standar',
             'resume' => 'penilai.components.print-resume',
             'memo' => 'penilai.components.print-memo',
             'rap' => 'penilai.components.print-out-rap',
@@ -1450,7 +1421,7 @@ class PenilaiController extends Controller
         }
 
 
-        if ($type === 'standard' || $type === 'sederhana') {
+        if ($type === 'standar' || $type === 'sederhana') {
             return $this->checkDataLpj($type, $statusLpj);
         }
 
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 4655298..78849d4 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -450,7 +450,7 @@ class PenilaianController extends Controller
 
     public function otorisatorUpdate(Request $request, $id, $context)
     {
-        if ($context === 'SLA') {
+        if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') {
             $authorization = Authorization::with(['user'])->find($id);
             if (!$authorization) {
                 return response()->json([
@@ -513,7 +513,7 @@ class PenilaianController extends Controller
                 }
                 break;
 
-            case 'sla':
+            case 'freze sla':
                 if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
                     $authorization->update([
                         'status'         => '3',
@@ -595,6 +595,14 @@ class PenilaianController extends Controller
                     ]);
                 }
                 break;
+            case 'unfreeze sla':
+                $authorization->update([
+                    'request'         => 'unfreeze-sla',
+                ]);
+                $permohonan->update([
+                    'status'         => 'unfreeze-sla',
+                ]);
+                break;
 
             default:
                 return response()->json([
@@ -633,7 +641,7 @@ class PenilaianController extends Controller
             'Pelaporan'  => 'proses-laporan',
             'Pembayaran' => 'proses',
             'Pembatalan' => 'batal',
-            'SLA'        => 'freeze',
+            'SLA'        => 'request-freeze',
             'Paparan' => 'proses-paparan',
             default      => '',
         };
@@ -665,7 +673,7 @@ class PenilaianController extends Controller
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             } elseif ($status == 'batal') {
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
-            } elseif ($status == 'freeze') {
+            } elseif ($status == 'request-freeze') {
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             } elseif ($status == 'proses-paparan') {
                 $query->whereRaw('LOWER(status) IN (?, ?)', ['proses-paparan', 'paparan']);
@@ -825,8 +833,8 @@ class PenilaianController extends Controller
     private function getViewLaporan($tipe)
     {
         $viewMap = [
-            'sederhana' => 'penilai.components.lpj-sederhana-standard',
-            'standard' => 'penilai.components.lpj-sederhana-standard',
+            'sederhana' => 'penilai.components.lpj-sederhana-standar',
+            'standar' => 'penilai.components.lpj-sederhana-standar',
             'resume' => 'penilai.components.resume',
             'memo' => 'penilai.components.memo',
             'rap' => 'penilai.components.rap-penilai',
@@ -891,7 +899,8 @@ class PenilaianController extends Controller
 
     public function revisiLaporan(Request $request, $id)
     {
-        if($request->dataHeader=='Paparan'){
+        // dd($id);
+        if($request->dataHeader=='Paparan' || $request->dataHeader=='Freze SLA'){
             $authorization = Authorization::find($id);
             $permohonan = Permohonan::find($authorization->permohonan_id);
         } else {
@@ -905,7 +914,13 @@ class PenilaianController extends Controller
             }
 
             $status = 'revisi-paparan';
-        } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
+        }else if($permohonan->status === 'request-freeze'){
+            if ($authorization) {
+                $authorization->delete();
+            }
+
+            $status = 'reject-freeze';
+        }elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
             $permohonan->update([
                 'approval_so'    => 0,
                 'approval_so_at' => null,
diff --git a/app/Http/Controllers/SLAController.php b/app/Http/Controllers/SLAController.php
index 3256aee..159995c 100644
--- a/app/Http/Controllers/SLAController.php
+++ b/app/Http/Controllers/SLAController.php
@@ -71,7 +71,7 @@ class SLAController extends Controller
             // abort(403, 'Sorry! You are not allowed to view users.');
         }
 
-        $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla');
+        $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze');
 
         // Pencarian berdasarkan parameter search
         if ($request->has('search') && !empty($request->get('search'))) {
diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php
index f250222..2cc6438 100644
--- a/app/Http/Controllers/SurveyorController.php
+++ b/app/Http/Controllers/SurveyorController.php
@@ -766,9 +766,15 @@ class SurveyorController extends Controller
 
             $permohonan->update([
                 'status' => 'survey-completed',
-                'submitted_at' => now()
             ]);
 
+            $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
+
+            $penilaian->update([
+                'status' => 'survey-completed',
+            ]);
+
+
             if($permohonan->jenisPenilaian->name=="External") {
                 LaporanExternal::updateOrCreate(
                     ['permohonan_id' => $permohonan->id],
@@ -916,10 +922,16 @@ class SurveyorController extends Controller
         try {
             $permohonan = Permohonan::findOrFail($id);
 
+            $permohonan->update([
+                'keterangan' => $request->keterangan,
+                'status' => 'request-freeze',
+            ]);
+
             Authorization::updateOrCreate([
                 'permohonan_id' => $permohonan->id,
-                'jenis' => 'sla'
+                'jenis' => 'sla',
             ], [
+                'keterangan' => $request->keterangan,
                 'request' => 'freeze',
                 'user_id' => Auth::user()->id
             ]);
@@ -2424,7 +2436,7 @@ class SurveyorController extends Controller
 
         $validator = Validator::make($request->all(), [
             'signature' => 'required',
-            'type' => 'required|in:penilai,cabang,debitur,kjjp',
+            'type' => 'required|in:penilai,cabang,debitur,kjpp',
             'name' => 'nullable|string',
             'document_id' => 'nullable|string'
         ]);
@@ -2531,7 +2543,7 @@ class SurveyorController extends Controller
     {
         try {
             $validator = Validator::make($request->all(), [
-                'type' => 'required|in:penilai,cabang,debitur,kjjp'
+                'type' => 'required|in:penilai,cabang,debitur,kjpp'
             ]);
 
             if ($validator->fails()) {
diff --git a/app/Models/LampiranDokumen.php b/app/Models/LampiranDokumen.php
index 27eb576..af514f5 100644
--- a/app/Models/LampiranDokumen.php
+++ b/app/Models/LampiranDokumen.php
@@ -27,7 +27,7 @@ class LampiranDokumen extends Base
     {
         $user = Auth::user();
 
-        if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin'])) {
+        if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor'])) {
             $file = $fileData['file'];
             $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName();
             $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public');
diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 1d8be54..11d37b7 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -22,9 +22,13 @@
                                     </td>
                                     <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
                                     <td style="padding: 2px;">
-                                        {{ $item }}
-                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                            <sup>m2</sup>
+                                        @if (strpos(strtolower($key), 'tanggal') !== false)
+                                            {{ formatTanggalIndonesia($item) }}
+                                        @else
+                                            {{ $item }}
+                                            @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                <sup>m2</sup>
+                                            @endif
                                         @endif
                                     </td>
                                 </tr>
diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 2debb71..4532394 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -308,6 +308,7 @@
                                                         </a>
                                                         </span>
                                                 <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
+
                                             </div>
 
                                             @if($detail->details)
diff --git a/resources/views/penilai/components/footer.blade.php b/resources/views/penilai/components/footer.blade.php
index e91d01d..5f521a1 100644
--- a/resources/views/penilai/components/footer.blade.php
+++ b/resources/views/penilai/components/footer.blade.php
@@ -43,7 +43,7 @@
                 'foto_gistaru' => 'Gistaru',
                 'foto_bhumi' => 'Bhumi',
                 'foto_argis_region' => 'Blad Tata Ruang ',
-                'foto_tempat' => 'Tempat',
+                'foto_tempat' => 'Peta Lokasi',
             ];
                 // Memindahkan foto_tempat ke depan jika ada
                 if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
diff --git a/resources/views/penilai/components/header.blade.php b/resources/views/penilai/components/header.blade.php
index b16c777..3d1829b 100644
--- a/resources/views/penilai/components/header.blade.php
+++ b/resources/views/penilai/components/header.blade.php
@@ -123,7 +123,7 @@
         }
     }
     use Modules\Usermanagement\Models\User;
-    $surveyorUser = User::where('id', $surveyor->userPenilaiTeam->id)->first();
+    $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
 
     $data = rtrim($data, ', ');
 @endphp
@@ -138,12 +138,12 @@
                 </td>
                 <td style="text-align: right;">
                     <p style="margin: 0; padding:0; font-size:10px;">
-                        Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }}
+                        Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
                     </p>
                     <p style="margin: 0; padding:0; font-size:10px;">
-                        Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
+                        Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
                     </p>
-                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
+                    <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $penilaiUser->name }}</p>
                 </td>
             </tr>
         </table>
diff --git a/resources/views/penilai/components/lpj-sederhana-standard.blade.php b/resources/views/penilai/components/lpj-sederhana-standar.blade.php
similarity index 100%
rename from resources/views/penilai/components/lpj-sederhana-standard.blade.php
rename to resources/views/penilai/components/lpj-sederhana-standar.blade.php
diff --git a/resources/views/penilai/components/print-memo.blade.php b/resources/views/penilai/components/print-memo.blade.php
index 9f9d27e..a6e0aa2 100644
--- a/resources/views/penilai/components/print-memo.blade.php
+++ b/resources/views/penilai/components/print-memo.blade.php
@@ -35,32 +35,29 @@
             <td style="text-align: center; margin-top: 5px;">
                 <h2 style="text-decoration: underline; text-transform: uppercase; text-align: center; margin: 0;">
                     MEMO ANTAR KANTOR</h2>
+                    <p style="font-size: 12px;  margin: 0;">NO: {{ $nomorLaporan ?? '' }}</p>
             </td>
         </tr>
     </table>
+    <hr/>
     <table style="width: 100%">
         <tr>
-            <td style="width: 20%; padding: 2px;">Kepada</td>
+            <td style="width: 25%; padding: 2px;">Kepada</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['kepada'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Dari</td>
+            <td style="width: 25%; padding: 2px;">Dari</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['dari'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">No memo</td>
-            <td style="width: 1%;  padding: 2px;">:</td>
-            <td style="width: 79%;  padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal</td>
+            <td style="width: 25%; padding: 2px;">Tanggal</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ formatTanggalIndonesia($memo['tanggal']) }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Perihal</td>
+            <td style="width: 25%; padding: 2px;">Perihal</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $memo['perihal'] ?? '' }}</td>
         </tr>
@@ -86,51 +83,44 @@
     <table style="width: 100%">
 
         <tr>
-            <td style="width: 20%; padding: 2px;">Nama Calon Debitur</td>
+            <td style="width: 25%; padding: 2px;">Nama Calon Debitur</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Jenis Aset</td>
+            <td style="width: 25%; padding: 2px;">Jenis Aset</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $data ?? '' }}</td>
         </tr>
 
         @include('lpj::component.print-out-dokument')
 
-
         <tr>
-            <td style="width: 20%; padding: 2px;">Atas Nama</td>
+            <td style="width: 25%; padding: 2px;">Atas Nama</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
 
         @if (!empty($memo['lokasi']['address']))
-            <tr>
-                <td width="20%">Terletak di</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['address'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Desa/Kelurahan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['village_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kecamatan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['district_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kabupaten/Kota</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['city_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Provinsi</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['province_code'] ?? '' }}</td>
-            </tr>
+            @php
+                $alamatFields = [
+                    'Terletak di' => 'address',
+                    'Desa/Kelurahan' => 'village_code',
+                    'Kecamatan' => 'district_code',
+                    'Kabupaten/Kota' => 'city_code',
+                    'Provinsi' => 'province_code'
+                ];
+            @endphp
+
+            @foreach ($alamatFields as $label => $field)
+                @if (!empty($alamat[$field]))
+                    <tr>
+                        <td width="25%">{{ $label }}</td>
+                        <td style="width: 1%; vertical-align: top;">:</td>
+                        <td>{{ $alamat[$field] }}</td>
+                    </tr>
+                @endif
+            @endforeach
         @endif
     </table>
 
@@ -146,25 +136,25 @@
 
     <table style="width: 100%">
         <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal Kunjungan</td>
+            <td style="width: 25%; padding: 2px;">Tanggal Kunjungan</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">
                 {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Surveyor</td>
+            <td style="width: 25%; padding: 2px;">Surveyor</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $surveyor->userPenilaiTeam->name ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Pihak Pemohon</td>
+            <td style="width: 25%; padding: 2px;">Pihak Pemohon</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->user->name ?? '' }} -
                 {{ $permohonan->debiture->branch->name ?? '' }}</td>
         </tr>
 
         <tr>
-            <td style="width: 20%; padding: 2px;">Pihak Cadeb/Debitur</td>
+            <td style="width: 25%; padding: 2px;">Pihak Cadeb/Debitur</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
@@ -295,9 +285,11 @@
     </table>
 </main>
 <div class="page-break"></div>
+@if (isset($memo['foto']))
+
 <table width="100%" border="0" style="align-content: center; text-align: center; margin-bottom: 20px">
     @foreach ($memo['foto'] as $item)
-        @php
+    @php
          $cleanedPath = str_replace('/storage/', '', $item);
             $imagePath = storage_path('app/public/' . $cleanedPath);
         @endphp
@@ -307,7 +299,7 @@
             </td>
         </tr>
     @endforeach
-
 </table>
+@endif
 
 @include('lpj::penilai.components.footer')
diff --git a/resources/views/penilai/components/print-out-call-report.blade.php b/resources/views/penilai/components/print-out-call-report.blade.php
index 8a8fe03..00303af 100644
--- a/resources/views/penilai/components/print-out-call-report.blade.php
+++ b/resources/views/penilai/components/print-out-call-report.blade.php
@@ -39,25 +39,26 @@
                 </td>
             </tr>
         </table>
+        <hr />
         <table style="width: 100%">
             <tr>
-                <td style="width: 20%; padding: 2px;">Kepada</td>
+                <td style="width: 25%; padding: 2px;">Kepada</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['kepada'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Dari</td>
+                <td style="width: 25%; padding: 2px;">Dari</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['dari'] ?? '' }}</td>
             </tr>
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Tanggal</td>
+                <td style="width: 25%; padding: 2px;">Tanggal</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ formatTanggalIndonesia($report['tanggal']) }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Perihal</td>
+                <td style="width: 25%; padding: 2px;">Perihal</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['perihal'] ?? '' }}</td>
             </tr>
@@ -75,24 +76,24 @@
         <table style="width: 100%">
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Nama Debitur</td>
+                <td style="width: 25%; padding: 2px;">Nama Debitur</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">KJPP</td>
+                <td style="width: 25%; padding: 2px;">KJPP</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ preg_replace('/^K\\d+ - /', '', $permohonan->penawaran->nama_kjpp_sebelumnya ?? '-') }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Jenis Aset</td>
+                <td style="width: 25%; padding: 2px;">Jenis Aset</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $data ?? '' }}</td>
             </tr>
 
             @if (!empty($report['lokasi']['address']))
                 <tr>
-                    <td style="width: 20%; padding: 2px;">Lokasi Objek Penilaian</td>
+                    <td style="width: 25%; padding: 2px;">Lokasi Objek Penilaian</td>
                     <td style="width: 1%;  padding: 2px;">:</td>
                     <td style="width: 79%;  padding: 2px;">{{ $report['lokasi']['address'] ?? '' }},
                         {{ $alamat['village_code'] ?? '' }} {{ $alamat['district_code'] ?? '' }},
@@ -103,22 +104,22 @@
             @include('lpj::component.print-out-dokument')
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Tanggal Penilaian</td>
+                <td style="width: 25%; padding: 2px;">Tanggal Penilaian</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Lelang ke</td>
+                <td style="width: 25%; padding: 2px;">Lelang ke</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $report['lelang_kjpp'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
+                <td style="width: 25%; padding: 2px;">Nilai Pasar Wajar (NPW)</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ isset($report['nilai_pasar_kjpp']) ? formatRupiah($report['nilai_pasar_kjpp']) : '-' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">
+                <td style="width: 25%; padding: 2px;">
                     Nilai Likuidasi
                     {{ isset($report['persentase_likuidasi_kjpp']) ? '(' . $report['persentase_likuidasi_kjpp'] . '%)' : '-' }}
                 </td>
@@ -142,25 +143,25 @@
 
         <table style="width: 100%">
             <tr>
-                <td style="width: 20%; padding: 2px;">Staf Subdit Appraisal </td>
+                <td style="width: 25%; padding: 2px;">Staf Subdit Appraisal </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">
                     {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Pihak KJPP</td>
+                <td style="width: 25%; padding: 2px;">Pihak KJPP</td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $forminspeksi['signature']['kjjp']['name'] ?? $report['pihak_kjjpp'] ?? '' }}</td>
             </tr>
             <tr>
-                <td style="width: 20%; padding: 2px;">Pihak BAGI Cab </td>
+                <td style="width: 25%; padding: 2px;">Pihak BAGI Cab </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->user->name ?? '' }} -
                     {{ $permohonan->debiture->branch->name ?? '' }}</td>
             </tr>
 
             <tr>
-                <td style="width: 20%; padding: 2px;">Debitur/perwakilan debitur </td>
+                <td style="width: 25%; padding: 2px;">Debitur/perwakilan debitur </td>
                 <td style="width: 1%;  padding: 2px;">:</td>
                 <td style="width: 79%;  padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
diff --git a/resources/views/penilai/components/print-out-rap.blade.php b/resources/views/penilai/components/print-out-rap.blade.php
index 19a768d..32e7432 100644
--- a/resources/views/penilai/components/print-out-rap.blade.php
+++ b/resources/views/penilai/components/print-out-rap.blade.php
@@ -28,32 +28,26 @@
     $data = rtrim($data, ', ');
 @endphp
 <main class="content">
-    <table>
-        <tr>
-            <td>
-                <h2 style="text-transform: uppercase;">Report Analisa Property</h2>
-            </td>
-        </tr>
-    </table>
+    <div style="text-align: center; margin-top: 5px;">
+        <h4 style="text-transform: uppercase; font-size: 16px; margin: 0;">Report Analisa Property
+            {{ $data }}</h4>
+        <p style="font-size: 12px; margin: 5px 0;">NO: {{ $nomorLaporan }}</p>
+    </div>
+    <hr />
 
     <table style="width: 100%;">
         <tr>
-            <td style="width: 20%; padding: 2px; vertical-align: top;">Kepada</td>
+            <td style="width: 25%; padding: 2px; vertical-align: top;">Kepada</td>
             <td style="width: 1%; vertical-align: top;">:</td>
             <td style="width: 79%;  vertical-align: top;">{{ $rap['kepada'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Dari</td>
+            <td style="width: 25%; padding: 2px;">Dari</td>
             <td style="width: 1%; padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">{{ $rap['dari'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">No</td>
-            <td style="width: 1%;  padding: 2px;">:</td>
-            <td style="width: 79%;  padding: 2px;">{{ $nomorLaporan ?? '-' }}</td>
-        </tr>
-        <tr>
-            <td style="width: 20%; padding: 2px;">Tanggal Survey</td>
+            <td style="width: 25%; padding: 2px;">Tanggal Survey</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">
                 {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</td>
@@ -77,7 +71,7 @@
             </td>
         </tr>
         <tr>
-            <td style="width: 20%; padding: 2px;">Perihal</td>
+            <td style="width: 25%; padding: 2px;">Perihal</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;">{{ $rap['perihal'] ?? '' }}</td>
         </tr>
@@ -87,7 +81,7 @@
     <h2 style="text-transform: uppercase;">NAMA DEVELOPER</h2>
     <table style="width: 100%; ">
         <tr>
-            <td style="width: 20%; padding: 2px;">Nama</td>
+            <td style="width: 25%; padding: 2px;">Nama</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;">{{ $permohonan->debiture->name ?? '' }}</td>
         </tr>
@@ -96,7 +90,7 @@
     <h2 style="text-transform: uppercase;">NAMA PROYEK</h2>
     <table style="width: 100%; ">
         <tr>
-            <td style="width: 20%; padding: 2px;">Proyek</td>
+            <td style="width: 25%; padding: 2px;">Proyek</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;">{{ $data ?? '' }}</td>
         </tr>
@@ -104,7 +98,7 @@
     <h2 style="text-transform: uppercase;">ALAMAT</h2>
     <table style="width: 100%; ">
         <tr>
-            <td width="20%">Terletak di</td>
+            <td width="25%">Terletak di</td>
             <td style="width: 1%; vertical-align: top;">:</td>
             <td> {{ $alamat['address'] ?? '' }}</td>
         </tr>
@@ -138,7 +132,7 @@
         @if (isset($forminspeksi['perizinan']) && is_array($forminspeksi['perizinan']) && count($forminspeksi['perizinan']) > 0)
             @foreach ($forminspeksi['perizinan'] as $perizinan)
                 <tr>
-                    <td style="width: 20%;  padding: 2px;">Perizinan</td>
+                    <td style="width: 25%;  padding: 2px;">Perizinan</td>
                     <td style="width: 1%;  padding: 2px;">:</td>
                     <td style="width: 79%;  padding: 2px;">{{ $perizinan['perizinan'] }}</td>
                 </tr>
@@ -148,7 +142,7 @@
         @if (isset($forminspeksi['brosur_price_list']) && count($forminspeksi['brosur_price_list']) > 0)
             @foreach ($forminspeksi['brosur_price_list'] as $perizinan)
                 <tr>
-                    <td style="width: 20%;  padding: 2px;">Brosur & Pricelist</td>
+                    <td style="width: 25%;  padding: 2px;">Brosur & Pricelist</td>
                     <td style="width: 1%;  padding: 2px;">:</td>
                     <td style="width: 79%;  padding: 2px;">{{ $perizinan['jenis'] }}</td>
                 </tr>
@@ -160,13 +154,13 @@
     <h2 style="text-transform: uppercase;">DESKRIPSI DEVELOPER</h2>
     <table style="width: 100%;">
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Pengalaman Developer & Proyek Yang Pernah
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Pengalaman Developer & Proyek Yang Pernah
                 Dibuat</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;">{!! nl2br(e($forminspeksi['pengalaman_developer'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Apakah Developer Anggota REI</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Apakah Developer Anggota REI</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['developer_anggota'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
@@ -175,7 +169,7 @@
         @isset($forminspeksi['lainnya_developer'])
             @foreach ($forminspeksi['lainnya_developer'] as $item)
                 <tr>
-                    <td style="vertical-align: top; width: 20%;  padding: 2px;">Lainnya</td>
+                    <td style="vertical-align: top; width: 25%;  padding: 2px;">Lainnya</td>
                     <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                     <td>
                         {!! nl2br(e($item)) !!}
@@ -187,43 +181,43 @@
     <h2 style="text-transform: uppercase;">KONDISI, LINGKUNGAN DAN PROGRESS PEMBANGUNAN</h2>
     <table style="width: 100%;">
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Kapan Mulai Dibangun & Target Penyelesaian
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Kapan Mulai Dibangun & Target Penyelesaian
             </td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['kapan_mulai_dibangun'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Kondisi Perumahan Saat Ini</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Kondisi Perumahan Saat Ini</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['kondisi_perumahan'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Progress Pembangunan</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Progress Pembangunan</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['progres_pembangunan'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Kontraktor (internal/eksternal)</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Kontraktor (internal/eksternal)</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['kontraktor'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Lingkungan Sekitar</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Lingkungan Sekitar</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['lingkungan_sekitar'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Komplek Lain Disekitar Lokasi</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Komplek Lain Disekitar Lokasi</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['komplek_disekitar'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Pusat Keramaian Dekat Lokasi</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Pusat Keramaian Dekat Lokasi</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['pusat_keramaian'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
         <tr>
-            <td style="vertical-align: top; width: 20%;  padding: 2px;">Transportasi Umum Yang Tersedia</td>
+            <td style="vertical-align: top; width: 25%;  padding: 2px;">Transportasi Umum Yang Tersedia</td>
             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
             <td>{!! nl2br(e($forminspeksi['transportasi_umum'] ?? 'Data tidak tersedia')) !!}</td>
         </tr>
@@ -232,7 +226,7 @@
         @isset($forminspeksi['lainnya_kondisi'])
             @foreach ($forminspeksi['lainnya_kondisi'] as $item)
                 <tr>
-                    <td style="vertical-align: top; width: 20%;  padding: 2px;">Lainnya</td>
+                    <td style="vertical-align: top; width: 25%;  padding: 2px;">Lainnya</td>
                     <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                     <td>
                         {!! nl2br(e($item)) !!}
@@ -249,7 +243,7 @@
                 @foreach ($forminspeksi['partisi'] as $key => $item)
                     @if (is_array($item))
                         <tr>
-                            <td style="vertical-align: top; width: 20%;  padding: 2px;">
+                            <td style="vertical-align: top; width: 25%;  padding: 2px;">
                                 {{ $item['nama'] ?? '' }}
                             </td>
                             <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index acce9e1..02cee4c 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -8,6 +8,12 @@
 @endphp
 
 <main class="content">
+    <div style="text-align: center; margin-top: 5px;">
+        <h4 style="text-transform: uppercase; font-size: 16px; margin: 0;">LAPORAN PENILAIAN ATAS
+            {{ $data }}</h4>
+        <p style="font-size: 12px; margin: 5px 0;">NO: {{ $nomorLaporan }}</p>
+    </div>
+    <hr />
     <table style="width: 100%">
         <tr>
             <td style="vertical-align: top;">
@@ -99,11 +105,6 @@
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">{{ $senior_officer->name ?? '' }}</td>
                     </tr>
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">No Laporan</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $nomorLaporan ?? '' }}</td>
-                    </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Tanggal Laporan</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
@@ -266,7 +267,7 @@
                                             @endphp
                                             <td style="padding: 2px; vertical-align: top;">Luas Tanah</td>
                                             <td style="padding: 2px; vertical-align: top;">:</td>
-                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td>
+                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
                                         </tr>
                                         <tr>
                                             <td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php
index f18a495..bf342e0 100644
--- a/resources/views/penilai/components/print-pembanding.blade.php
+++ b/resources/views/penilai/components/print-pembanding.blade.php
@@ -44,6 +44,9 @@
 
                                 @elseif($key == 'tanggal')
                                             {{ formatTanggalIndonesia($data[$key]) ?? '-' }}
+                                @elseif($key == 'telepon')
+                                        {{ isset($data['telepon']) ? ubahNomorHp($data['telepon']) : '-' }}
+
                                 @elseif($key == 'kordinat')
                                     @php
                                         $lat = $data['kordinat_lat'] ?? null;
diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php
index cd076ef..a13c512 100644
--- a/resources/views/penilai/index.blade.php
+++ b/resources/views/penilai/index.blade.php
@@ -165,13 +165,15 @@
                 tujuan_penilaian_id: {
                     title: 'Tujuan Penilaian',
                     render: (item, data) => {
-                        return data.tujuan_penilaian && data.tujuan_penilaian.name ? `${data.tujuan_penilaian.name}` : '-';
+                        return data.tujuan_penilaian && data.tujuan_penilaian.name ?
+                            `${data.tujuan_penilaian.name}` : '-';
                     },
                 },
                 jenis_fasilitas_kredit_id: {
                     title: 'Fasilitas Kredit',
                     render: (item, data) => {
-                        return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ? `${data.jenisfasilitas_kredit.name}` : '-';
+                        return data.jenisfasilitas_kredit && data.jenisfasilitas_kredit.name ?
+                            `${data.jenisfasilitas_kredit.name}` : '-';
                     },
                 },
                 jenis_laporan: {
@@ -183,7 +185,7 @@
                 tanggal_survei: {
                     title: 'Tanggal Survei',
                     render: (item, data) => {
-                        if(data.penilaian.waktu_penilaian){
+                        if (data.penilaian.waktu_penilaian) {
                             return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;
                         }
                         return `${formatDate(new Date(data.penilaian.created_at))}`;
@@ -196,19 +198,19 @@
                         const tipe_laporan = data.penilai?.type;
                         const nilai_plafond = data.penilaian.nilaiPlafond?.name;
                         let waktu_penilaian = new Date(data.penilaian.created_at);
-                        if(data.penilaian.waktu_penilaian){
+                        if (data.penilaian.waktu_penilaian) {
                             waktu_penilaian = new Date(data.penilaian.waktu_penilaian);
                         }
 
-                        if(tujuan_penilaian.name==="RAP"){
+                        if (tujuan_penilaian.name === "RAP") {
                             waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
                         } else {
-                            if(tipe_laporan==="sederhana"){
+                            if (tipe_laporan === "sederhana") {
                                 waktu_penilaian.setDate(waktu_penilaian.getDate() + 2);
-                            } else if(tipe_laporan==="standar"){
-                                if(nilai_plafond==="2 M - 5 M"){
+                            } else if (tipe_laporan === "standar") {
+                                if (nilai_plafond === "2 M - 5 M") {
                                     waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
-                                } else if(nilai_plafond==="< 2M"){
+                                } else if (nilai_plafond === "< 2M") {
                                     waktu_penilaian.setDate(waktu_penilaian.getDate() + 3);
                                 } else {
                                     waktu_penilaian.setDate(waktu_penilaian.getDate() + 5);
@@ -232,7 +234,10 @@
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
-                        if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data.status === 'revisi-paparan') {
+                        if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data
+                            .status === 'paparan' || data.status === 'proses-paparan' || data.status ===
+                            'paparan' || data.status == 'revisi-laporan' || data.status === 'done' || data
+                            .status === 'revisi-paparan' || data.status === 'unfreeze-sla') {
                             return `
                         <div class="flex flex-nowrap justify-center gap-1.5">
                             <a class="btn btn-sm btn-icon btn-clear btn-info" href="penilai/${data.id}/show">
@@ -245,9 +250,17 @@
                         <i class="ki-filled ki-arrow-circle-right"></i>
                         </button>
                         </div>`;
-                        } else {
+                        } else if (data.status === 'freeze' || data.status === 'request-freeze') {
+                            return `
+            <div class="flex flex-nowrap justify-center">
+                <a class="btn btn-sm btn-icon btn-clear btn-warning" onclick="showLoadingSwal('Masih dalam proses pengajuan freeze...')">
+                    <i class="ki-filled ki-watch"></i>
+                </a>
+            </div>`;
+                        } else
+                         {
                             return `<div class="flex flex-nowrap justify-center">
-                            <a class="btn btn-sm btn-icon btn-clear btn-success" onclick="showLoadingSwal('Masih Menunggu proses inspeksi dari surveyor...')">
+                            <a class="btn btn-sm btn-icon btn-clear btn-success" onclick="showLoadingSwal('Masih Menunggu proses ...')">
                                 <i class="ki-filled ki-watch"></i>
                             </a>
                         </div>`
@@ -268,56 +281,56 @@
     </script>
 
     <script>
-         function surveyorFreeze(permohonanId, noReg, debitur) {
+        function surveyorFreeze(permohonanId, noReg, debitur) {
 
-Swal.fire({
-    title: 'Apakah Anda yakin?',
-    text: "Yakin akan Request Freeze dengan " + noReg + " untuk Debitur " + debitur +
-        " ?",
-    icon: 'warning',
-    input: 'textarea',
-    inputLabel: 'Keterangan',
-    inputPlaceholder: 'Masukkan keterangan...',
-    inputAttributes: {
-        'aria-label': 'Masukkan keterangan'
-    },
-    showCancelButton: true,
-    confirmButtonColor: '#3085d6',
-    cancelButtonColor: '#d33',
-    confirmButtonText: 'Ya, Lanjutkan!',
-    cancelButtonText: 'Batal',
-}).then((result) => {
-    if (result.isConfirmed) {
-        const userMessage = result.value || ''; // Ambil pesan dari textarea
-        $.ajaxSetup({
-            headers: {
-                'X-CSRF-TOKEN': '{{ csrf_token() }}'
-            },
-        });
-        $.ajax({
-            url: `/surveyor/storeFreeze/${permohonanId}`,
-            type: 'POST',
-            data: {
-                message: userMessage
-            },
-            success: (response) => {
-                Swal.fire('Berhasil!',
-                    response.message,
-                    'success').then(() => {
-                    window.location.reload();
-                });
-                console.log(response);
-            },
-            error: (error) => {
-                console.error('Error:', error);
-                Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan Freeze.',
-                    'error');
-            }
-        });
-    }
-});
+            Swal.fire({
+                title: 'Apakah Anda yakin?',
+                text: "Yakin akan Request Freeze dengan " + noReg + " untuk Debitur " + debitur +
+                    " ?",
+                icon: 'warning',
+                input: 'textarea',
+                inputLabel: 'Keterangan',
+                inputPlaceholder: 'Masukkan keterangan...',
+                inputAttributes: {
+                    'aria-label': 'Masukkan keterangan'
+                },
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Ya, Lanjutkan!',
+                cancelButtonText: 'Batal',
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    const userMessage = result.value || ''; // Ambil pesan dari textarea
+                    $.ajaxSetup({
+                        headers: {
+                            'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                        },
+                    });
+                    $.ajax({
+                        url: `/surveyor/storeFreeze/${permohonanId}`,
+                        type: 'POST',
+                        data: {
+                            keterangan: userMessage
+                        },
+                        success: (response) => {
+                            Swal.fire('Berhasil!',
+                                response.message,
+                                'success').then(() => {
+                                window.location.reload();
+                            });
+                            console.log(response);
+                        },
+                        error: (error) => {
+                            console.error('Error:', error);
+                            Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan Freeze.',
+                                'error');
+                        }
+                    });
+                }
+            });
 
-}
+        }
 
         function showLoadingSwal(message, duration = 5000) {
             Swal.fire({
diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php
index 153fb18..297f1bc 100644
--- a/resources/views/penilai/show.blade.php
+++ b/resources/views/penilai/show.blade.php
@@ -491,10 +491,10 @@
                 .then(data => {
                     if (data.status) {
                         // Jika status LPJ sudah ada, arahkan langsung ke halaman
-                        if (data.status === 'standard') {
+                        if (data.status === 'standar') {
                             showLoadingSwal('Tunggu ...');
                             window.location.href =
-                                `{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
+                                `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
                         } else if (data.status === 'sederhana') {
                             showLoadingSwal('Tunggu ...');
                             window.location.href =
@@ -524,7 +524,7 @@
                                 denyButtonColor: '#d33',
                             }).then((result) => {
                                 if (result.isConfirmed) {
-                                    saveStatusLpj(permohonanId, documentId, inspeksiId, 'standard',
+                                    saveStatusLpj(permohonanId, documentId, inspeksiId, 'standar',
                                         jaminanId);
                                 } else if (result.isDenied) {
                                     saveStatusLpj(permohonanId, documentId, inspeksiId, 'sederhana',
@@ -556,9 +556,9 @@
         }).then(response => response.json())
             .then(data => {
                 if (data.success) {
-                    if (type === 'standard') {
+                    if (type === 'standar') {
                         window.location.href =
-                            `{{ route('penilai.standard', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
+                            `{{ route('penilai.standar', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
                     } else if (type === 'sederhana') {
                         window.location.href =
                             `{{ route('penilai.sederhana', $permohonan->id) }}?documentId=${documentId}&inspeksiId=${inspeksiId}&jaminanId=${jaminanId}`;
diff --git a/resources/views/penilaian/otorisator/index-sla.blade.php b/resources/views/penilaian/otorisator/index-sla.blade.php
index a6b91b2..37fd065 100644
--- a/resources/views/penilaian/otorisator/index-sla.blade.php
+++ b/resources/views/penilaian/otorisator/index-sla.blade.php
@@ -183,7 +183,7 @@
                         return `${data.permohonan.debiture.name}`;
                     },
                 },
-                alasan: {
+                keterangan: {
                     title: 'Alasan',
                 },
                 request: {
diff --git a/resources/views/penilaian/otorisator/sla.blade.php b/resources/views/penilaian/otorisator/sla.blade.php
index f6f1375..c5f399a 100644
--- a/resources/views/penilaian/otorisator/sla.blade.php
+++ b/resources/views/penilaian/otorisator/sla.blade.php
@@ -1,8 +1,8 @@
 @extends('layouts.main')
 
 @php
-    if($header=="sla"){
-        $header = "Freze SLA";
+    if ($header == 'sla') {
+        $header = 'Freze SLA';
     }
 @endphp
 
@@ -20,55 +20,56 @@
         @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index'])
 
         @foreach ($permohonan->documents as $dokumen)
-        <div class="card border border-agi-100 pb-2.5">
-            <div class="card-header bg-agi-50" id="basic_settings">
-                <h3 class="card-title">
-                    Team
-                </h3>
-            </div>
+            <div class="card border border-agi-100 pb-2.5">
+                <div class="card-header bg-agi-50" id="basic_settings">
+                    <h3 class="card-title">
+                        Team
+                    </h3>
+                </div>
 
-            <div class="card-body grid gap-5">
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    @php
-                        $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
-                        $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
+                <div class="card-body grid gap-5">
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        @php
+                            $surveyor = $permohonan->penilaian->userPenilai->where('role', 'surveyor')->first();
+                            $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first();
 
-                    @endphp
-                    <label class="form-label max-w-56">
-                        Surveyor
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
+                        @endphp
+                        <label class="form-label max-w-56">
+                            Surveyor
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
 
-                        <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $surveyor->userPenilaiTeam->name }}
-                        </p>
+                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                                {{ $surveyor->userPenilaiTeam->name }}
+                            </p>
 
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
-                        </p>
-                    </div>
-                    <label class="form-label max-w-56">
-                        Penilai
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
+                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                                {{ checkRegionUserName($surveyor->userPenilaiTeam->id) }}
+                            </p>
+                        </div>
+                        <label class="form-label max-w-56">
+                            Penilai
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
 
-                        <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $penilai->userPenilaiTeam->name }}
-                        </p>
+                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                                {{ $penilai->userPenilaiTeam->name }}
+                            </p>
 
-                        <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ checkRegionUserName($penilai->userPenilaiTeam->id) }}
-                        </p>
+                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                                {{ checkRegionUserName($penilai->userPenilaiTeam->id) }}
+                            </p>
+                        </div>
                     </div>
                 </div>
+                @php
+                    $inspeksiId = null;
+                    foreach ($dokumen->inspeksi as $item) {
+                        $inspeksiId = $item->id;
+                    }
+                @endphp
             </div>
-            @php
-                $inspeksiId = null;
-                foreach ($dokumen->inspeksi as $item) {
-                    $inspeksiId = $item->id;
-                }
-            @endphp
-        </div>
-    @endforeach
+        @endforeach
 
         <div class="card border border-agi-100 pb-2.5">
             <div class="card-header bg-agi-50" id="basic_settings">
@@ -78,33 +79,33 @@
             </div>
 
             <div class="card-body grid gap-5">
-                {{ $authorization->alasan ?? ''}}
+                {{ $authorization->keterangan ?? '' }}
                 <table class="table table-border">
                     <tbody>
-                    <tr>
-                        <td>Pemohon</td>
-                        <td>{{ $authorization->user->name }}</td>
-                    </tr>
-                    <tr>
-                        <td>Alasan</td>
-                        <td>{{ $authorization->alasan }}</td>
-                    </tr>
-                    <tr>
-                        <td>Tanggal Permohonan</td>
-                        <td>{{ formatTanggalIndonesia($authorization->created_at,1) }}</td>
-                    </tr>
+                        <tr>
+                            <td>Pemohon</td>
+                            <td>{{ $authorization->user->name }}</td>
+                        </tr>
+                        <tr>
+                            <td>Alasan</td>
+                            <td>{{ $authorization->keterangan }}</td>
+                        </tr>
+                        <tr>
+                            <td>Tanggal Permohonan</td>
+                            <td>{{ formatTanggalIndonesia($authorization->created_at, 1) }}</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>
         </div>
 
         @php
-            if($header=="SLA"){
-                $header = "Freze SLA";
+            if ($header == 'SLA') {
+                $header = 'Freze SLA';
             }
         @endphp
 
-        @if($authorization->approve_so)
+        @if ($authorization->approve_so)
             <div class="card border border-agi-100 pb-2.5">
                 <div class="card-header bg-agi-50" id="basic_settings">
                     <h3 class="card-title">
@@ -115,25 +116,28 @@
                 <div class="card-body">
                     <table class="table table-border">
                         <tbody>
-                        <tr>
-                            <td>Diperiksa Oleh</td>
-                            <td>{{ getUser($authorization->approve_so)->name ?? 'N/A' }}</td>
-                            <td>{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at,1) : 'N/A' }}</td>
-                        </tr>
-                        @if($authorization->approve_eo!=null)
-                        <tr>
-                            <td>Disetujui Oleh (EO)</td>
-                            <td>{{ getUser($authorization->approve_eo)->name ?? 'N/A' }}</td>
-                            <td>{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at,1) : 'N/A' }}</td>
-                        </tr>
-                        @endif
-                        @if(in_array($authorization->nilai_eafond_id,[1,4]) && $authorization->approve_dd!=null)
-                        <tr>
-                            <td>Disetujui Oleh (DD)</td>
-                            <td>{{ getUser($authorization->approve_dd)->name ?? 'N/A' }}</td>
-                            <td>{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at,1) : 'N/A' }}</td>
-                        </tr>
-                        @endif
+                            <tr>
+                                <td>Diperiksa Oleh</td>
+                                <td>{{ getUser($authorization->approve_so)->name ?? 'N/A' }}</td>
+                                <td>{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }}
+                                </td>
+                            </tr>
+                            @if ($authorization->approve_eo != null)
+                                <tr>
+                                    <td>Disetujui Oleh (EO)</td>
+                                    <td>{{ getUser($authorization->approve_eo)->name ?? 'N/A' }}</td>
+                                    <td>{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }}
+                                    </td>
+                                </tr>
+                            @endif
+                            @if (in_array($authorization->nilai_eafond_id, [1, 4]) && $authorization->approve_dd != null)
+                                <tr>
+                                    <td>Disetujui Oleh (DD)</td>
+                                    <td>{{ getUser($authorization->approve_dd)->name ?? 'N/A' }}</td>
+                                    <td>{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }}
+                                    </td>
+                                </tr>
+                            @endif
                         </tbody>
                     </table>
                 </div>
@@ -141,99 +145,212 @@
         @endif
         <div>
             <div>
-            <div class="flex gap-2.5">
-                @php
-                    $inspeksiId = null;
-                    $documentId = null;
-                    $jenisJaminanId = null;
-                    foreach ($permohonan->documents as $item) {
-                        foreach ($item->inspeksi as $key => $value) {
-                            $inspeksiId = $item->id;
+                <div class="flex gap-2.5">
+                    @php
+                        $inspeksiId = null;
+                        $documentId = null;
+                        $jenisJaminanId = null;
+                        foreach ($permohonan->documents as $item) {
+                            foreach ($item->inspeksi as $key => $value) {
+                                $inspeksiId = $item->id;
+                            }
+                            $documentId = $item->id;
+                            $jenisJaminanId = $item->jenis_jaminan_id;
                         }
-                        $documentId = $item->id;
-                        $jenisJaminanId = $item->jenis_jaminan_id;
-                    }
-                @endphp
+                    @endphp
 
-                @if ($dataHeader == 'pelaporan')
-                    <a class="btn btn-success"
-                        href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{true}}">
-                        Lihat Laporan
-                    </a>
-                @endif
+                    @if ($dataHeader == 'pelaporan')
+                        <a class="btn btn-success"
+                            href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&inspeksiId={{ $inspeksiId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}">
+                            Lihat Laporan
+                        </a>
+                    @endif
 
-                @if(Auth::user()->hasAnyRole(['administrator','senior-officer']) && $authorization->approve_so==null)
-                    <button onclick="otorisatorData({{ $authorization->id }})" type="button" class="btn btn-primary">
-                        <i class="ki-filled ki-double-check"></i>
-                        Otorisasi {{ $header ?? '' }}
-                    </button>
-                @endif
+                    @if (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) && $authorization->approve_so == null)
+                        <button onclick="otorisatorData({{ $authorization->id }}, 'SO')" type="button"
+                            class="btn btn-primary">
+                            <i class="ki-filled ki-double-check"></i>
+                            Otorisasi {{ $header ?? '' }}
+                        </button>
+                    @endif
 
-                @if(Auth::user()->hasAnyRole(['administrator','EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo==null)
-                    <button onclick="otorisatorData({{ $authorization->id }})" type="button" class="btn btn-primary">
-                        <i class="ki-filled ki-double-check"></i>
-                        Otorisasi {{ $header ?? '' }}
-                    </button>
-                @endif
+                    @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
+                            $authorization->approve_so &&
+                            $authorization->approve_eo == null)
+                        <button onclick="otorisatorData({{ $authorization->id }}, 'EO')" type="button"
+                            class="btn btn-primary">
+                            <i class="ki-filled ki-double-check"></i>
+                            Otorisasi {{ $header ?? '' }}
+                        </button>
+                    @endif
 
-                @if(Auth::user()->hasAnyRole(['administrator','DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd==null && in_array($permohonan->nilai_plafond_id,[1,4]))
-                    <button onclick="otorisatorData({{ $authorization->id }})" type="button" class="btn btn-primary">
-                        <i class="ki-filled ki-double-check"></i>
-                        Otorisasi {{ $header ?? '' }}
-                    </button>
-                @endif
+                    @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) &&
+                            $authorization->approve_eo &&
+                            $authorization->approve_dd == null &&
+                            in_array($permohonan->nilai_plafond_id, [1, 4]))
+                        <button onclick="otorisatorData({{ $authorization->id }}, 'DD')" type="button"
+                            class="btn btn-primary">
+                            <i class="ki-filled ki-double-check"></i>
+                            Otorisasi {{ $header ?? '' }}
+                        </button>
+                    @endif
+
+                    @if (
+                        (Auth::user()->hasAnyRole(['administrator', 'senior-officer']) &&
+                            $authorization->approve_so != null &&
+                            $authorization->approve_eo != null) ||
+                            $authorization->approve_dd != null)
+                        <button onclick="otorisatorData({{ $authorization->id }}, 'UNFREZE')" type="button"
+                            class="btn btn-primary">
+                            <i class="ki-filled ki-double-check"></i>
+                            Otorisasi Un{{ $header ?? '' }}
+                        </button>
+                    @endif
+                </div>
             </div>
         </div>
-    </div>
-@endsection
+    @endsection
 
-@push('scripts')
-    <script>
-        function otorisatorData(dataId) {
-            const dataHeader = @json($header);
-            Swal.fire({
-                title: 'Apakah Anda yakin?',
-                text: `Untuk melakukan otorisator ${dataHeader}!`,
-                icon: 'warning',
-                input: 'textarea',
-                inputLabel: 'Keterangan',
-                inputPlaceholder: 'Masukkan keterangan...',
-                inputAttributes: {
-                    'aria-label': 'Masukkan keterangan'
-                },
-                showCancelButton: true,
-                confirmButtonColor: '#3085d6',
-                cancelButtonColor: '#d33',
-                confirmButtonText: 'Ya, Lanjutkan!',
-                cancelButtonText: 'Batal',
-            }).then((result) => {
-                if (result.isConfirmed) {
-                    const userMessage = result.value || ''; // Ambil pesan dari textarea
-                    $.ajaxSetup({
-                        headers: {
-                            'X-CSRF-TOKEN': '{{ csrf_token() }}'
-                        },
-                    });
-                    $.ajax({
-                        url: `/otorisator/otorisator/${dataId}/SLA`,
-                        type: 'POST',
-                        data: {
-                            message: userMessage
-                        },
-                        success: (response) => {
-                            Swal.fire('Berhasil!', 'Data berhasil diotorisasi. Menunggu Approval EO dan atau DD', 'success').then(() => {
-                                window.location.reload();
-                            });
-                            console.log(response);
-                        },
-                        error: (error) => {
-                            console.error('Error:', error);
-                            Swal.fire('Gagal!', 'Terjadi kesalahan saat melakukan otorisator.',
-                                'error');
+    @push('scripts')
+        <script>
+            const handleRejection = (dataId, dataHeader = '') => {
+                Swal.fire({
+                    title: 'Masukkan alasan penolakan:',
+                    input: 'textarea',
+                    inputPlaceholder: 'Tuliskan alasan...',
+                    showCancelButton: true,
+                    confirmButtonColor: '#f39c12',
+                    cancelButtonColor: '#d33',
+                    confirmButtonText: 'Kirim',
+                    cancelButtonText: 'Batal',
+                    preConfirm: (alasan) => {
+                        if (!alasan) {
+                            Swal.showValidationMessage('Alasan harus diisi!');
+                            return false;
                         }
-                    });
+                        return alasan;
+                    }
+                }).then((rejectResult) => {
+                    if (rejectResult.isConfirmed) {
+                        handleAjaxRequest(
+                            `/otorisator/revisi-laporan/${dataId}`, {
+                                keterangan: rejectResult.value,
+                                dataHeader: dataHeader
+                            },
+                            'Data berhasil ditolak.',
+                            'Terjadi kesalahan saat melakukan penolakan.'
+                        );
+                    }
+                });
+            };
+
+            const showSwalConfirmation = (
+                title, text, html, confirmText, denyText, cancelText, preConfirm, icon = 'question'
+            ) => {
+                return Swal.fire({
+                    title: title,
+                    text: text,
+                    html: html,
+                    icon: icon,
+                    focusConfirm: false,
+                    preConfirm: preConfirm,
+                    showCancelButton: true,
+                    showDenyButton: !!denyText,
+                    confirmButtonColor: '#3085d6',
+                    cancelButtonColor: '#d33',
+                    denyButtonColor: '#f39c12',
+                    confirmButtonText: confirmText,
+                    denyButtonText: denyText,
+                    cancelButtonText: cancelText,
+                });
+            };
+
+            const handleAjaxRequest = (url, data, successMessage, errorMessage) => {
+                $.ajaxSetup({
+                    headers: {
+                        'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                    },
+                });
+                $.ajax({
+                    url: url,
+                    type: 'POST',
+                    data: data,
+                    success: () => {
+                        Swal.fire('Berhasil!', successMessage, 'success').then(() => {
+                            const redirectUrl = `/otorisator/sla`;
+                            window.location.href = redirectUrl;
+                        });
+                    },
+                    error: (error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Gagal!', errorMessage, 'error');
+                    }
+                });
+            };
+
+            function otorisatorData(dataId, role = '') {
+                let dataHeader = @json($header);
+
+                // Update dataHeader if condition matches
+                if (dataHeader === 'Freze SLA' && (role === 'UNFREZE' || role === 'FREZE')) {
+                    dataHeader = 'Unfreeze SLA';
                 }
-            });
-        }
-    </script>
-@endpush
+
+                const isPaparanSO = dataHeader === 'Unfreeze SLA' && role === 'UNFREZE';
+                const hideDenyButton = (dataHeader === 'Unfreeze SLA' && (role === 'UNFREZE' || role === 'FREZE'));
+
+                const swalHtml = isPaparanSO ? `
+        <div class="text-left space-y-4">
+            <p class="text-gray-700 text-center">Untuk melakukan otorisasi ${dataHeader}!</p>
+            <div>
+                <textarea id="swal-keterangan" class="textarea" placeholder="Masukkan Keterangan"></textarea>
+            </div>
+        </div>` : '';
+
+                showSwalConfirmation(
+                    'Apakah Anda yakin?',
+                    `Untuk melakukan otorisasi ${dataHeader}!`,
+                    swalHtml,
+                    'Ya, Lanjutkan!',
+                    hideDenyButton ? null : 'Tolak',
+                    'Batal',
+                    () => {
+                        if (isPaparanSO) {
+                            const message = document.getElementById('swal-keterangan')?.value;
+
+                            if (!message) {
+                                Swal.showValidationMessage('Keterangan harus diisi!');
+                                return false;
+                            }
+
+                            return {
+                                message,
+                            };
+                        } else {
+                            return {
+                                message: 'Ya, lanjutkan.'
+                            };
+                        }
+                    },
+                    'question'
+                ).then((result) => {
+                    if (result.isConfirmed) {
+                        const requestData = isPaparanSO ? {
+                            keterangan: result.value.message,
+                        } : {
+                            keterangan: result.value.message
+                        };
+
+                        handleAjaxRequest(
+                            `/otorisator/otorisator/${dataId}/${dataHeader}`,
+                            requestData,
+                            'Data berhasil diotorisasi.',
+                            'Terjadi kesalahan saat melakukan otorisasi.'
+                        );
+                    } else if (!hideDenyButton && result.isDenied) {
+                        handleRejection(dataId, dataHeader);
+                    }
+                });
+            }
+        </script>
+    @endpush
diff --git a/resources/views/permohonan/authorization/index.blade.php b/resources/views/permohonan/authorization/index.blade.php
index 2a84158..6906698 100644
--- a/resources/views/permohonan/authorization/index.blade.php
+++ b/resources/views/permohonan/authorization/index.blade.php
@@ -154,7 +154,7 @@
                 debitur_id: {
                     title: 'Debitur',
                     render: (item, data) => {
-                        return `${data.debiture.name}`;
+                        return `${data.debiture?.name}`;
                     },
                 },
                 tujuan_penilaian_id: {
diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php
index 9f6e622..5778669 100644
--- a/resources/views/surveyor/components/bangunan.blade.php
+++ b/resources/views/surveyor/components/bangunan.blade.php
@@ -16,7 +16,7 @@
                                 $total_luas_bangunan = 0;
                                 $jenis_legalitas_jaminan_id = 0;
                                 if (isset($item->detail)) {
-                                    $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10);
+                                    $total_luas_bangunan = calculateTotalLuas($item->detail, 'luas_bangunan', 10, 27, 3);
                                 }
                             @endphp
                             <input type="hidden" id="jenis_legalistas_jaminan_bangunan_id"
diff --git a/resources/views/surveyor/components/inspeksi.blade.php b/resources/views/surveyor/components/inspeksi.blade.php
index 108249e..9bcef2a 100644
--- a/resources/views/surveyor/components/inspeksi.blade.php
+++ b/resources/views/surveyor/components/inspeksi.blade.php
@@ -54,7 +54,7 @@
                 </div>
                 <div class="card-body">
                     <div class="flex items-baseline justify-between flex-wrap lg:flex-nowrap">
-                        @foreach (['penilai', 'cabang', 'debitur', 'kjjp'] as $type)
+                        @foreach (['penilai', 'cabang', 'debitur', 'kjpp'] as $type)
                             @include('lpj::component.signature-pad', ['type' => $type])
                         @endforeach
 
@@ -95,7 +95,7 @@
         console.log(datas);
         document.addEventListener('DOMContentLoaded', function() {
             const signaturePads = {};
-    const types = ['penilai', 'cabang', 'debitur', 'kjjp'];
+    const types = ['penilai', 'cabang', 'debitur', 'kjpp'];
 
     // Initialize all signature pads
     types.forEach(type => initSignaturePad(type));
diff --git a/resources/views/surveyor/components/print-out/main.blade.php b/resources/views/surveyor/components/print-out/main.blade.php
index e7401a4..39e8bd2 100644
--- a/resources/views/surveyor/components/print-out/main.blade.php
+++ b/resources/views/surveyor/components/print-out/main.blade.php
@@ -203,10 +203,10 @@
                 <td style="text-align: right;">
                     <div style="">
                         <p style="margin: 0; padding:0; font-size:10px;">
-                            Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('d-m-Y') }}
+                            Tanggal: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('d-m-Y') }}
                         </p>
                         <p style="margin: 0; padding:0; font-size:10px;">
-                            Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->waktu_penilaian)->format('H:i') }}
+                            Waktu: {{ \Carbon\Carbon::parse($permohonan->penilaian->updated_at)->format('H:i') }}
                         </p>
                         <p style="margin: 0; padding:0;  font-size:10px;">User: {{ $surveyorUser->name }}</p>
                     </div>
@@ -574,10 +574,10 @@
                             @endif
 
                             <!-- K.J.P.P -->
-                            @if (isset($forminspeksi['signature']['kjjp']))
+                            @if (isset($forminspeksi['signature']['kjpp']))
                                 <td style="width: 100px;">
                                     <img style="width: 100px;"
-                                        src="{{ $forminspeksi['signature']['kjjp']['image'] }}" alt="KJPP">
+                                        src="{{ $forminspeksi['signature']['kjpp']['image'] }}" alt="KJPP">
                                 </td>
                             @endif
                         </tr>
@@ -605,9 +605,9 @@
                                     <span>{{ ucwords(strtolower('DEBITUR/PERWAKILAN')) }}</span>
                                 </td>
                             @endif
-                            @if (isset($forminspeksi['signature']['kjjp']['name']))
+                            @if (isset($forminspeksi['signature']['kjpp']['name']))
                                 <td style=" text-align: center">
-                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['kjjp']['name'])) }}</span>
+                                    <span>{{ ucwords(strtolower($forminspeksi['signature']['kjpp']['name'])) }}</span>
                                     <br />
                                     <span>{{ strtoupper('K.J.P.P') }}</span>
                                 </td>
diff --git a/resources/views/surveyor/components/tanah.blade.php b/resources/views/surveyor/components/tanah.blade.php
index 3c8391b..ea7f5db 100644
--- a/resources/views/surveyor/components/tanah.blade.php
+++ b/resources/views/surveyor/components/tanah.blade.php
@@ -14,10 +14,11 @@
                     @if (isset($permohonan->documents))
                         @foreach ($permohonan->documents as $item)
                             @php
+                            // 27
                                 $total_luas_tanah = 0;
                                 $jenis_legalitas_jaminan_id = 0;
                                 if (isset($item->detail)) {
-                                    $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1);
+                                    $total_luas_tanah = calculateTotalLuas($item->detail, 'luas_tanah', 1, 27, 3);
                                 }
                             @endphp
                             <input type="hidden" id="jenis_legalistas_jaminan_tanah_id"
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 71a3801..b62b23d 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -614,7 +614,7 @@ Breadcrumbs::for('penilai.showDataPembanding', function (BreadcrumbTrail $trail)
 });
 
 
-Breadcrumbs::for('penilai.standard', function (BreadcrumbTrail $trail) {
+Breadcrumbs::for('penilai.standar', function (BreadcrumbTrail $trail) {
     $trail->parent('penilai.show');
     $trail->push('Standard');
 });
diff --git a/routes/web.php b/routes/web.php
index e6033c1..b497718 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -604,7 +604,7 @@ Route::middleware(['auth'])->group(function () {
         Route::post('import/kertas-kerja', [PenilaiController::class, 'import_kertas_kerja'])->name('import.kertas-kerja');
 
         Route::get('sederhana/{id}', [PenilaiController::class, 'sederhana'])->name('sederhana');
-        Route::get('standard/{id}', [PenilaiController::class, 'standard'])->name('standard');
+        Route::get('standar/{id}', [PenilaiController::class, 'standar'])->name('standar');
         Route::get('resume', [PenilaiController::class, 'resume'])->name('resume');
         Route::get('memo', [PenilaiController::class, 'memo'])->name('memo');
         Route::get('paparan', [PenilaiController::class, 'paparan'])->name('paparan');