diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index ab5897b..cde7ca9 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -514,10 +514,10 @@ class PenilaianController extends Controller
                     $status = 'done';
                 }
 
-                if($status=='done'){
+                if ($status == 'done') {
                     $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find(6);
 
-                    if(isset($_permohonan->penilai->lpj)){
+                    if (isset($_permohonan->penilai->lpj)) {
                         $npw = json_decode($_permohonan->penilai->lpj, true);
                         $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
                     }
@@ -559,7 +559,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator'  && $authorization->approve_so && $authorization->approve_eo === null) {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
+                    if (!in_array($permohonan->nilai_plafond_id, [1, 2])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -603,7 +603,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1,4])) {
+                    if (!in_array($permohonan->nilai_plafond_id, [1,2])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
diff --git a/resources/views/component/print-out-dokument.blade.php b/resources/views/component/print-out-dokument.blade.php
index 11d37b7..8cb86f0 100644
--- a/resources/views/component/print-out-dokument.blade.php
+++ b/resources/views/component/print-out-dokument.blade.php
@@ -27,7 +27,7 @@
                                         @else
                                             {{ $item }}
                                             @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                                <sup>m2</sup>
+                                            <span>m²</span>
                                             @endif
                                         @endif
                                     </td>
diff --git a/resources/views/penilai/components/analisa/apartement-kantor.blade.php b/resources/views/penilai/components/analisa/apartement-kantor.blade.php
index 78227a7..de20f71 100644
--- a/resources/views/penilai/components/analisa/apartement-kantor.blade.php
+++ b/resources/views/penilai/components/analisa/apartement-kantor.blade.php
@@ -18,7 +18,7 @@
         @endphp
         <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Unit</td>
         <td style="width: 1%; padding: 2px; vertical-align: top;">:</td>
-        <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}</td>
+        <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}     <span>m²</span></td>
     </tr>
     <tr>
         <td style="width: 25%; padding: 2px; vertical-align: top;">Bentuk Unit</td>
diff --git a/resources/views/penilai/components/analisa/bangunan.blade.php b/resources/views/penilai/components/analisa/bangunan.blade.php
index 9725588..ab8fa6d 100644
--- a/resources/views/penilai/components/analisa/bangunan.blade.php
+++ b/resources/views/penilai/components/analisa/bangunan.blade.php
@@ -22,7 +22,7 @@
                         : '-');
             @endphp
 
-            {{ $output }} <sup>m2</sup>
+            {{ $output }} <span>m²</span>
         </td>
 
     </tr>
diff --git a/resources/views/penilai/components/analisa/tanah.blade.php b/resources/views/penilai/components/analisa/tanah.blade.php
index 8c50a6a..d34790c 100644
--- a/resources/views/penilai/components/analisa/tanah.blade.php
+++ b/resources/views/penilai/components/analisa/tanah.blade.php
@@ -16,7 +16,7 @@
             @endphp
             <td style="width: 25%; padding: 2px; vertical-align: top;">Luas Tanah</td>
             <td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
-            <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <sup>m2</sup></td>
+            <td style="width: 74%; padding: 2px; vertical-align: top;">{{ $luas ?? '' }}    <span>m²</span></td>
         </tr>
         <tr>
             @php
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index fbb0b38..3ebc2f9 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -270,7 +270,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 ?? '' }} <sup>m2</sup></td>
+                                            <td style="padding: 2px; vertical-align: top;">{{ $luas ?? '' }} <span>m²</span></td>
                                         </tr>
                                         <tr>
                                             <td style="padding: 2px; vertical-align: top;">Bentuk Tanah</td>
@@ -373,7 +373,7 @@
                                                             : '-');
                                                 @endphp
 
-                                                {{ $output }} <sup>m2</sup>
+                                                {{ $output }}     <span>m²</span>
                                             </td>
 
                                         </tr>
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index f71ccb0..da74054 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -216,7 +216,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null)
+                        @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2]))
                             <button onclick="otorisatorData({{ $authorization->id }},'EO')" type="button"
                                 class="btn btn-primary">
                                 <i class="ki-filled ki-double-check"></i>
@@ -224,7 +224,7 @@
                             </button>
                         @endif
 
-                        @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo &&  $authorization->approve_dd == null)
+                        @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>
diff --git a/resources/views/surveyor/components/denah.blade.php b/resources/views/surveyor/components/denah.blade.php
index b8aff28..6dbe2f9 100644
--- a/resources/views/surveyor/components/denah.blade.php
+++ b/resources/views/surveyor/components/denah.blade.php
@@ -94,7 +94,7 @@
                                             <div class="flex flex-wrap gap-4">
                                                 <div class="flex w-full items-center justify-center gap-4">
                                                     <label class="form-label max-w-56">
-                                                        <span class="form-label">Total Luas</span>
+                                                        <span class="form-label"> Luas</span>
                                                     </label>
                                                     <input type="text" name="luas_denah[]"
                                                         class="input w-full number-format"
@@ -151,7 +151,7 @@
                                         <div class="flex flex-wrap gap-4">
                                             <div class="flex w-full items-center justify-center gap-4">
                                                 <label class="form-label max-w-56">
-                                                    <span class="form-label">Total Luas</span>
+                                                    <span class="form-label"> Luas</span>
                                                 </label>
                                                 <input type="text" name="luas_denah[]" class="input w-full number-format"
                                                     onkeyup="formatNumber(this)">
@@ -164,6 +164,17 @@
                     </div>
 
 
+                    <div class="w-full p-4">
+                        <div class="flex flex-wrap gap-4">
+                            <div class="flex w-full items-center justify-center gap-4">
+                                <label class="form-label max-w-56">
+                                    <span class="form-label">Total Luas</span>
+                                </label>
+                                <input type="text" name="total_luas" id="totalLuas" class="input w-full number-format" readonly>
+
+                            </div>
+                        </div>
+                    </div>
                     <div class="flex justify-end gap-2" style="margin-right: 20px; margin-top: 20px">
                         <button type="button" class="btn btn-success" id="saveButton" onclick="submitDenah()">
                             <span id="saveButtonText">Save</span>
@@ -229,6 +240,32 @@
             });
         });
 
+        function calculateTotalLuas() {
+            let totalLuas = 0;
+
+            const luasInputs = document.querySelectorAll('input[name="luas_denah[]"]');
+            luasInputs.forEach(input => {
+                const value = parseFloat(input.value.replace(/[^0-9.]/g, ''));
+                if (!isNaN(value)) {
+                    totalLuas += value;
+                }
+            });
+
+            const totalLuasInput = document.getElementById('totalLuas');
+            totalLuasInput.value = totalLuas ? `${totalLuas.toLocaleString()} m²` : '';
+        }
+
+        // Tambahkan event listener untuk setiap input luas_denah[]
+        document.addEventListener('input', function (e) {
+            if (e.target && e.target.name === 'luas_denah[]') {
+                calculateTotalLuas();
+            }
+        });
+
+        // Jalankan hitung ulang saat halaman dimuat (jika ada nilai default)
+        document.addEventListener('DOMContentLoaded', calculateTotalLuas);
+
+
         function createDenahElement(index) {
             const denahItem = document.createElement('div');
             denahItem.className = 'denah-item grid gap-5 mb-5 border p-4 rounded';
@@ -267,7 +304,7 @@
                     <div class="flex flex-wrap gap-4">
                         <div class="flex w-full items-center justify-center gap-4">
                             <label class="form-label max-w-56">
-                                <span class="form-label">Total Luas</span>
+                                <span class="form-label"> Luas</span>
                             </label>
                             <input type="text" name="luas_denah[]"
                                 class="input w-full number-format"
diff --git a/resources/views/surveyor/components/header.blade.php b/resources/views/surveyor/components/header.blade.php
index 2434668..d10e7bf 100644
--- a/resources/views/surveyor/components/header.blade.php
+++ b/resources/views/surveyor/components/header.blade.php
@@ -21,12 +21,12 @@
                         class="btn btn-xs btn-info">
                         <i class="ki-filled ki-exit-left"></i> Back
                     </a>
-                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor']) && Route::currentRouteName('penilai.show'))
+                @elseif (Auth::user()->hasAnyRole(['administrator', 'surveyor', 'penilai']))
                     @if (Request::is('surveyor/inspeksi/*/create') && request()->has('dokument') && request()->has('jenis_jaminan'))
                         <a href="{{ route('surveyor.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>
-                    @else
+                    @elseif (Request::is('penilai/*/*'))
                         <a href="{{ route('penilai.show', $permohonan->id) }}" class="btn btn-xs btn-info">
                             <i class="ki-filled ki-exit-left"></i> Back
                         </a>