diff --git a/resources/views/penilai/components/informasi-pembanding.blade.php b/resources/views/penilai/components/informasi-pembanding.blade.php
index 87a8896..61a303e 100644
--- a/resources/views/penilai/components/informasi-pembanding.blade.php
+++ b/resources/views/penilai/components/informasi-pembanding.blade.php
@@ -23,10 +23,18 @@
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">Jenis Properti</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <span>{{ $item['jenis_aset'] }}</span>
+                                <span>{{ $item['jenis_aset'] ?? '' }}</span>
                             </div>
                         </div>
 
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">Alamat Lokasi</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <span>{{ $item['address'] ?? '' }}</span>
+                            </div>
+                        </div>
+
+
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">Harga Penawaran</label>
                             <div class="flex flex-wrap items-baseline w-full">
@@ -34,6 +42,12 @@
                             </div>
                         </div>
 
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">Indikasi Harga Transaksi</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <span>{{ isset($item['harga_diskon']) ? formatRupiah($item['harga_diskon']) : '' }}</span>
+                            </div>
+                        </div>
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">Penjual (HP)</label>
                             <div class="flex flex-wrap items-baseline w-full">
@@ -44,14 +58,14 @@
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">Ditawarkan sejak</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <span>{{ $item['penawaran'] }}</span>
+                                <span>{{ $item['penawaran'] ?? '' }}</span>
                             </div>
                         </div>
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">LT</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <span>{{ $item['luas_tanah'] }} </span>
+                                <span>{{ $item['luas_tanah'] ?? '' }} </span>
                                  <sup> m2</sup>
                             </div>
                         </div>
@@ -59,7 +73,7 @@
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">LB</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <span>{{ $item['luas_bangunan'] }} </span>
+                                <span>{{ $item['luas_bangunan'] ?? '' }} </span>
                                 <sup> m2</sup>
                             </div>
                         </div>
@@ -67,7 +81,7 @@
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">Titik Koordinat</label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <span>{{ $item['kordinat_lat'] }} , {{ $item['kordinat_lng'] }}</span>
+                                <span>{{ $item['kordinat_lat'] ?? '' }} , {{ $item['kordinat_lng'] ?? '' }}</span>
                             </div>
                         </div>
 
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 54b8b27..d5710cc 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -741,117 +741,20 @@
         </tr>
     </table>
 
-    <table style="width: 100%">
-        <tr>
-            <td style="border: 1px solid #000;">
-                D. ASURANSI
-            </td>
-        </tr>
-        @if (!empty($lpjData['asuransi_luas_bangunan']))
-            <tr>
-                <td>
-                    <table border="1" style="width: 100%; border-collapse: collapse; margin-bottom: 10px;">
-                        <tr>
-
-                            <td style="border: 1px solid #000; padding: 4px;">Luas Bangunan</td>
-                            <td style="border: 1px solid #000; padding: 4px;">Harga</td>
-                            <td style="border: 1px solid #000; padding: 4px;">Nilai Pasar Wajar (Rp)</td>
-                        </tr>
-
-                        <tr>
-                            <td style="border: 1px solid #000; padding: 4px;">
-                                {{ $lpjData['asuransi_luas_bangunan'] ?? '' }}</td>
-
-                            <td style="border: 1px solid #000; padding: 4px;">
-                                {{ formatRupiah($lpjData['asuransi_nilai_1']) ?? '' }}</td>
-                            <td style="border: 1px solid #000; padding: 4px;">
-                                {{ formatRupiah($lpjData['asuransi_nilai_2']) ?? '' }}</td>
-                        </tr>
-
-                    </table>
-                </td>
-            </tr>
-        @else
-            <tr>
-                <td>Tidak Ada</td>
-            </tr>
-        @endif
-    </table>
 
     <table style="width: 100%">
         <tr>
             <td style="  border: 1px solid #000;">
-                E. INFORMASI HARGA
-            </td>
-        </tr>
-    </table>
-
-    <table style="width: 100%;">
-        <tr>
-            <td style="vertical-align: top;">Informasi data pembanding</td>
-            <td>:</td>
-            <td>
-                @php
-                    $exportData = [];
-                    if (isset($dataPembanding['data_pembanding'])) {
-                        foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
-                            $exportData['pembanding' . ($index + 1)] = $pembanding;
-                        }
-                    }
-
-                    $fields = [
-                        'jenis_aset' => 'Jenis properti',
-                        'harga' => 'Harga Penawaran',
-                        'telepon' => 'Penjual (HP)',
-                        'penawaran' => 'Ditawarkan Sejak',
-                        'luas_tanah' => 'Luas Tanah',
-                        'luas_bangunan' => 'Luas Bangunan',
-                        'kordinat' => 'Titik Kordinat',
-                    ];
-                @endphp
-
-                @foreach ($exportData as $index => $data)
-                    <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
-                        <tr>
-                            <td style="font-weight: bold; padding-bottom: 8px;">
-                                Pembanding {{ substr($index, -1) }}
-                            </td>
-                        </tr>
-                        @foreach ($fields as $key => $label)
-                            <tr>
-                                <td style="width: 33%;">{{ $label }}</td>
-                                <td style="width: 5%;">:</td>
-                                <td style="width: 62%;">
-                                    @if ($key == 'luas_tanah' || $key == 'luas_bangunan')
-                                        {{ $data[$key] ?? '-' }} m²
-                                    @elseif($key == 'harga' || $key == 'harga_diskon')
-                                        Rp. {{ $data[$key] ?? 0 }}
-                                    @elseif($key == 'kordinat')
-                                        @php
-                                            $lat = $data['kordinat_lat'] ?? null;
-                                            $lng = $data['kordinat_lng'] ?? null;
-                                        @endphp
-                                        @if ($lat && $lng)
-                                            {{ $lat }},{{ $lng }}
-                                        @else
-                                            -
-                                        @endif
-                                    @else
-                                        {{ $data[$key] ?? '-' }}
-                                    @endif
-                                </td>
-                            </tr>
-                        @endforeach
-                    </table>
-                @endforeach
+                D. INFORMASI HARGA
             </td>
         </tr>
     </table>
 
+    @include('lpj::penilai.components.print-pembanding')
 
     <table style="width: 100%">
         <tr>
-            <td style="border: 1px solid #000; "> <strong>F. INFORMASI NILAI</strong>
+            <td style="border: 1px solid #000; "> <strong>E. INFORMASI NILAI</strong>
             </td>
         </tr>
     </table>
@@ -946,7 +849,7 @@
     <table style="width: 100%;">
         <tr>
             <td style="border: 1px solid #000;">
-                G. ANALISA FAKTA
+                F. ANALISA FAKTA
             </td>
         </tr>
         <tr>
diff --git a/resources/views/penilai/components/print-out-standard.blade.php b/resources/views/penilai/components/print-out-standard.blade.php
index 79f5eb1..538493f 100644
--- a/resources/views/penilai/components/print-out-standard.blade.php
+++ b/resources/views/penilai/components/print-out-standard.blade.php
@@ -282,67 +282,7 @@
             </td>
         </tr>
     </table>
-    <table style="width: 100%; ">
-        <tr>
-            <td style="width:25%; vertical-align: top;">Informasi data pembanding</td>
-            <td style="width:1%; vertical-align: top;">:</td>
-            <td style="vertical-align: top;">
-                @php
-                    $exportData = [];
-                    if (isset($dataPembanding['data_pembanding'])) {
-                        foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
-                            $exportData['pembanding' . ($index + 1)] = $pembanding;
-                        }
-                    }
-
-                    $fields = [
-                        'jenis_aset' => 'Jenis properti',
-                        'harga' => 'Harga Penawaran',
-                        'telepon' => 'Penjual (HP)',
-                        'penawaran' => 'Ditawarkan Sejak',
-                        'luas_tanah' => 'Luas Tanah',
-                        'luas_bangunan' => 'Luas Bangunan',
-                        'kordinat' => 'Titik Kordinat',
-                    ];
-                @endphp
-
-                @foreach ($exportData as $index => $data)
-                    <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
-                        <tr>
-                            <td style="font-weight: bold; padding-bottom: 8px;">
-                                Pembanding {{ substr($index, -1) }}
-                            </td>
-                        </tr>
-                        @foreach ($fields as $key => $label)
-                            <tr>
-                                <td style="width: 33%;">{{ $label }}</td>
-                                <td style="width: 5%;">:</td>
-                                <td style="width: 62%;">
-                                    @if ($key == 'luas_tanah' || $key == 'luas_bangunan')
-                                        {{ $data[$key] ?? '-' }} m²
-                                    @elseif($key == 'harga' || $key == 'harga_diskon')
-                                        {{ formatRupiah($data[$key]) ?? 0 }}
-                                    @elseif($key == 'kordinat')
-                                        @php
-                                            $lat = $data['kordinat_lat'] ?? null;
-                                            $lng = $data['kordinat_lng'] ?? null;
-                                        @endphp
-                                        @if ($lat && $lng)
-                                            {{ $lat }},{{ $lng }}
-                                        @else
-                                            -
-                                        @endif
-                                    @else
-                                        {{ $data[$key] ?? '-' }}
-                                    @endif
-                                </td>
-                            </tr>
-                        @endforeach
-                    </table>
-                @endforeach
-            </td>
-        </tr>
-    </table>
+    @include('lpj::penilai.components.print-pembanding')
     <table style="width: 100%; ">
         <tr>
             <td style="width: 100%; border: 1px solid #000; text-align: center;">
diff --git a/resources/views/penilai/components/print-pembanding.blade.php b/resources/views/penilai/components/print-pembanding.blade.php
new file mode 100644
index 0000000..fdeaf12
--- /dev/null
+++ b/resources/views/penilai/components/print-pembanding.blade.php
@@ -0,0 +1,63 @@
+<table style="width: 100%; ">
+    <tr>
+        <td style="width:25%; vertical-align: top;">Informasi data pembanding</td>
+        <td style="width:1%; vertical-align: top;">:</td>
+        <td style="vertical-align: top;">
+            @php
+                $exportData = [];
+                if (isset($dataPembanding['data_pembanding'])) {
+                    foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
+                        $exportData['pembanding' . ($index + 1)] = $pembanding;
+                    }
+                }
+
+                $fields = [
+                    'jenis_aset' => 'Jenis properti',
+                    'address' => 'Alamat Lokasi',
+                    'harga' => 'Harga Penawaran',
+                    'harga_diskon' => 'Informasi Harga Transaksi',
+                    'telepon' => 'Penjual (HP)',
+                    'penawaran' => 'Ditawarkan Sejak',
+                    'luas_tanah' => 'Luas Tanah',
+                    'luas_bangunan' => 'Luas Bangunan',
+                    'kordinat' => 'Titik Kordinat',
+                ];
+            @endphp
+
+            @foreach ($exportData as $index => $data)
+                <table style="width: 100%; margin-bottom: 15px; border-bottom: 1px solid #ddd;">
+                    <tr>
+                        <td style="font-weight: bold; padding-bottom: 8px;">
+                            Pembanding {{ substr($index, -1) }}
+                        </td>
+                    </tr>
+                    @foreach ($fields as $key => $label)
+                        <tr>
+                            <td style="width: 33%;">{{ $label }}</td>
+                            <td style="width: 5%;">:</td>
+                            <td style="width: 62%;">
+                                @if ($key == 'luas_tanah' || $key == 'luas_bangunan')
+                                    {{ $data[$key] ?? '-' }} m²
+                                @elseif($key == 'harga' || $key == 'harga_diskon')
+                                    {{ formatRupiah($data[$key]) ?? 0 }}
+                                @elseif($key == 'kordinat')
+                                    @php
+                                        $lat = $data['kordinat_lat'] ?? null;
+                                        $lng = $data['kordinat_lng'] ?? null;
+                                    @endphp
+                                    @if ($lat && $lng)
+                                        {{ $lat }},{{ $lng }}
+                                    @else
+                                        -
+                                    @endif
+                                @else
+                                    {{ $data[$key] ?? '-' }}
+                                @endif
+                            </td>
+                        </tr>
+                    @endforeach
+                </table>
+            @endforeach
+        </td>
+    </tr>
+</table>
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 978a5da..70cea81 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -134,9 +134,6 @@
                                 <i class="ki-filled ki-double-check"></i>
                                 Otorisator {{ $header ?? '' }}
                             </button>
-                            <button class="btn btn-warning" onclick="revisiLaporan({{ $permohonan->id }})">
-                                <i class="ki-filled ki-arrow-circle-right"></i> Revisi
-                            </button>
                         @endif
 
                         @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
@@ -185,8 +182,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
-                                $authorization->approve_eo == null)
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_eo == null)
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -209,10 +205,38 @@
 
     @push('scripts')
         <script>
-            function otorisatorData(dataId, role = '') {
-                const dataHeader = @json($header);
-                if (dataHeader == 'Paparan') {
-                    const showSwalConfirmation = (title, text, html, confirmText, denyText, cancelText, preConfirm) => {
+            const handleRejection = (dataId) => {
+                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/${dataId}`, {
+                                message: rejectResult.value
+                            },
+                            'Data berhasil ditolak.',
+                            'Terjadi kesalahan saat melakukan penolakan.'
+                        );
+                    }
+                });
+            };
+
+
+            const showSwalConfirmation = (title, text, html, confirmText, denyText, cancelText, preConfirm) => {
                         return Swal.fire({
                             title: title,
                             text: text,
@@ -253,35 +277,12 @@
                         });
                     };
 
-                    const handleRejection = (dataId) => {
-                        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/${dataId}`, {
-                                        message: rejectResult.value
-                                    },
-                                    'Data berhasil ditolak.',
-                                    'Terjadi kesalahan saat melakukan penolakan.'
-                                );
-                            }
-                        });
-                    };
+            function otorisatorData(dataId, role = '') {
+                const dataHeader = @json($header);
+                if (dataHeader == 'Paparan') {
+
+
+
 
                     // Main logic based on role
                     if (role === 'SO') {
@@ -395,49 +396,38 @@
                     }
 
                 } else {
-                    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) => {
+
+
+
+                    showSwalConfirmation(
+                        'Apakah Yakin?',
+                        'Pastikan  sudah dilakukan!',
+                        `
+                            <p class="text-gray-700 text-center">Untuk melakukan otorisator ${dataHeader}!</p>
+                            <textarea id="swal-keterangan" class="block w-full px-4 py-2 border border-gray-300 rounded-lg shadow-sm focus:ring-blue-500 focus:border-blue-500 sm:text-sm" placeholder="Masukkan keterangan..."></textarea>
+                            `,
+                        'Ya, Lanjutkan!', 'Rejected', 'Batal',
+                        () => {
+                            const keterangan = document.getElementById('swal-keterangan').value;
+                            if (!keterangan) {
+                                Swal.showValidationMessage('Keterangan harus diisi!');
+                                return false;
+                            }
+                            return {
+                                keterangan
+                            };
+                        }
+                    ).then((result) => {
                         if (result.isConfirmed) {
-                            const userMessage = result.value || ''; // Ambil pesan dari textarea
-                            $.ajaxSetup({
-                                headers: {
-                                    'X-CSRF-TOKEN': '{{ csrf_token() }}'
+                            handleAjaxRequest(
+                                `/otorisator/otorisator/${dataId}/${dataHeader}`, {
+                                    message: result.value.keterangan
                                 },
-                            });
-                            $.ajax({
-                                url: `/otorisator/otorisator/${dataId}/${dataHeader}`,
-                                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');
-                                }
-                            });
+                                'Data berhasil diotorisasi.',
+                                'Terjadi kesalahan saat melakukan otorisator.'
+                            );
+                        } else if (result.isDenied) {
+                            handleRejection(dataId);
                         }
                     });
                 }