diff --git a/app/Http/Controllers/DebitureController.php b/app/Http/Controllers/DebitureController.php
index c8b6c8b..98a76fe 100644
--- a/app/Http/Controllers/DebitureController.php
+++ b/app/Http/Controllers/DebitureController.php
@@ -129,7 +129,7 @@
             // Retrieve data from the database
             $query = Debiture::query();
 
-            if (!Auth::user()->hasAnyRole(['administrator'])) {
+            if (!Auth::user()->hasAnyRole(['administrator','admin'])) {
                 $query = $query->where('branch_id', Auth::user()->branch_id);
             }
 
diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php
index 16fd2b9..9cdea71 100644
--- a/app/Http/Controllers/PembayaranController.php
+++ b/app/Http/Controllers/PembayaranController.php
@@ -245,7 +245,7 @@ class PembayaranController extends Controller
 
             $permohonan->approve_bayar_by = null;
             $permohonan->approve_bayar_at = null;
-            $permohonan->status           = 'done';
+            $permohonan->status           = 'proses-laporan';
             $permohonan->save();
         } else {
             $persetujuanPenawaran = PersetujuanPenawaran::create(
diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php
index 01d6f76..46900bd 100644
--- a/app/Http/Controllers/PenilaiController.php
+++ b/app/Http/Controllers/PenilaiController.php
@@ -157,7 +157,7 @@ class PenilaiController extends Controller
         $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
 
         if ($permohonan->status == 'proses-laporan') {
-            return redirect()->back()->with('error', 'Masih dalam proses laporan');
+            //return redirect()->back()->with('error', 'Masih dalam proses laporan');
         }
 
         $basicData =  $this->surveyorController->getCommonData();
@@ -841,10 +841,10 @@ class PenilaiController extends Controller
             $permohonan = Permohonan::findOrFail($id);
 
             if ($permohonan->status === 'proses-laporan') {
-                return response()->json([
+                /*return response()->json([
                     'success' => false,
                     'message' => 'Masih proses laporan',
-                ], 400);
+                ], 400);*/
             }
 
             if ($permohonan->status === 'proses-paparan') {
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 142dea2..38ebae1 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -518,7 +518,7 @@ class PenilaianController extends Controller
                 $status = 'done';
                 $approvalField = null;
 
-                $lpj_ = optional(json_decode($permohonan->penilaian->lpj));
+                $lpj_ = optional(json_decode($permohonan->penilai->lpj));
                 $npw = $lpj_->total_nilai_pasar_wajar ?? 0;
                 $npw = str_replace('.', '', $npw);
 
diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index 6fc8e56..cf911e3 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -50,6 +50,9 @@
         {
             $validate = $request->validated();
             if ($validate) {
+                if(auth()->user()->hasRole('admin')){
+                       $validate['status'] = "preregister";
+               }
                 try {
                     // Process file upload
                     $filePath = null;
@@ -172,7 +175,7 @@
             // Retrieve data from the database
             $query = Permohonan::query();
 
-            if (!Auth::user()->hasAnyRole(['administrator'])) {
+            if (!Auth::user()->hasAnyRole(['administrator','admin'])) {
                 $query = $query->where('branch_id', Auth::user()->branch_id);
             }
 
@@ -371,14 +374,21 @@
                 }
 
                 if ($permohonan->status == 'sudah_dibayar') {
-                    $buktiBayar = $permohonan->documents->filter(function ($doc) {
-                        return $doc->detail && $doc->detail->nama === 'Bukti Bayar';
+
+                    $documents = $permohonan->dokumenjaminan->first(function ($doc) {
+                        return $doc->detail && $doc->detail->contains('name', 'Bukti Bayar');
                     });
 
+                    $buktiBayar = $documents->detail->filter(function ($detail) {
+                        return $detail->name == 'Bukti Bayar';
+                    })->first() ?? null;
+
                     if ($buktiBayar->isEmpty()) {
                         return redirect()->route('authorization.show', $id)->with('error', 'Bukti Bayar harus diunggah');
                     }
 
+                    $dokumenJaminan = json_decode($buktiBayar->dokumen_jaminan);
+
                     $persetujuanPenawaran = PersetujuanPenawaran::firstOrCreate(
                         ['permohonan_id' => $id],
                         [
diff --git a/app/Http/Controllers/SpkController.php b/app/Http/Controllers/SpkController.php
index 2d9530a..1800e0c 100644
--- a/app/Http/Controllers/SpkController.php
+++ b/app/Http/Controllers/SpkController.php
@@ -345,6 +345,19 @@ use Illuminate\Support\Facades\Auth;
             $content = $pdf->download()->getOriginalContent();
             Storage::put('public/'.$newFileNameWithPath,$content);
 
+            $permohonanModel = Permohonan::where('nomor_registrasi', $penawaran->nomor_registrasi)->first();
+            if ($permohonanModel) {
+                $permohonanModel->status = 'registrasi-final';
+                $permohonanModel->save();
+            }
+
+            $persetujuanPenawaran = PenawaranTender::where('id', $penawaran->id)->first();
+            if ($persetujuanPenawaran) {
+                $persetujuanPenawaran->status = 'registrasi-final';
+                $persetujuanPenawaran->save();
+            }
+
+
             $data1['status'] = 'success';
             $data1['spkpenawaran_path'] = $spkpenawaran_path;
             $data1['message']['message_success'] = array('Generate SPK PDF successfully');
diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index a3a579f..909987f 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -48,7 +48,6 @@
                     ),
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
-                    'branch_id'          => auth()->user()->branch_id,
                     'status'             => 'order'
                 ]);
             }
diff --git a/module.json b/module.json
index 4e073af..8185608 100644
--- a/module.json
+++ b/module.json
@@ -308,7 +308,8 @@
                 "permission": "",
                 "roles": [
                     "administrator",
-                    "pemohon-ao"
+                    "pemohon-ao",
+                    "admin"
                 ]
             },
             {
@@ -320,7 +321,8 @@
                 "permission": "",
                 "roles": [
                     "administrator",
-                    "pemohon-ao"
+                    "pemohon-ao",
+                    "admin"
                 ]
             },
             {
diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php
index d3103aa..148682d 100644
--- a/resources/views/component/form-penilai.blade.php
+++ b/resources/views/component/form-penilai.blade.php
@@ -438,13 +438,18 @@
     function calculateTotal() {
         const parseInput = (value) => {
             if (!value) return 0;
-            return parseFloat(value.replace(/[^0-9]/g, '')) || 0;
+            // keep the dot as decimal separator, remove thousand separators
+            const cleaned = value.replace(/[^0-9.,]/g, '').replace(/\./g, '').replace(/,/g, '.');
+            return parseFloat(cleaned) || 0;
         };
 
         // Function to format currency
         function formatCurrency(value) {
             // Ensure we have a valid number to format
-            const num = parseFloat(value.replace(/[^0-9]/g, '')) || 0;
+            //const num = parseFloat(value.replace(/[^0-9]/g, '')) || 0;
+            //return num.toLocaleString('id-ID');
+            let num = value.replace(/[^0-9.,]/g, '').replace(/\./g, '').replace(/,/g, '.');
+            num = parseFloat(num) || 0;
             return num.toLocaleString('id-ID');
         }
 
diff --git a/resources/views/debitur/components/debitur.blade.php b/resources/views/debitur/components/debitur.blade.php
index 348235f..724cfcd 100644
--- a/resources/views/debitur/components/debitur.blade.php
+++ b/resources/views/debitur/components/debitur.blade.php
@@ -10,7 +10,7 @@
             <span class="text-danger">*</span>
         </label>
         <div class="flex flex-wrap items-baseline w-full">
-            @if(auth()->user()->hasRole('administrator'))
+            @if(auth()->user()->hasRole('administrator','admin'))
                 <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="branch_id" id="branch_id">
                     <option value="">Pilih Cabang</option>
                     @foreach($branches as $branch)
diff --git a/resources/views/debitur/index.blade.php b/resources/views/debitur/index.blade.php
index e139a63..17f98d1 100644
--- a/resources/views/debitur/index.blade.php
+++ b/resources/views/debitur/index.blade.php
@@ -20,7 +20,7 @@
                     <div class="flex flex-wrap gap-2.5">
                         <div class="h-[24px] border border-r-gray-200"></div>
                         <a class="btn btn-sm btn-light" href="{{ route('debitur.export') }}"> Export to Excel </a>
-                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao']))
+                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao','admin']))
                             <a class="btn btn-sm btn-primary" href="{{ route('debitur.create') }}"> Tambah Debitur </a>
                         @endif
                     </div>
diff --git a/resources/views/pembayaran/approval.blade.php b/resources/views/pembayaran/approval.blade.php
index b058c97..aa0ec82 100644
--- a/resources/views/pembayaran/approval.blade.php
+++ b/resources/views/pembayaran/approval.blade.php
@@ -282,8 +282,7 @@
                 nominal_bayar: {
                     title: 'Nominal Bayar',
                     render: (item, data) => {
-                        return data.nominal_bayar ? `${window.formatRupiah(data.nominal_bayar)}` : `${window.formatRu
-piah(data.biaya_final)}`;
+                        return data.nominal_bayar ? `${window.formatRupiah(data.nominal_bayar)}` : `${window.formatRupiah(data.biaya_final)}`;
                     },
                 },
                 bukti_bayar: {
@@ -344,7 +343,7 @@ piah(data.biaya_final)}`;
 
                         var iconPembayaranOtorisator = '';
                         if (permohonan) {
-                            if (permohonan.status_bayar !== 'sudah_bayar') {
+                            if (permohonan.status_bayar !== 'sudah_bayar' || !permohonan.approve_bayar) {
                                 iconPembayaranOtorisator = `<a class="btn btn-sm btn-icon btn-clear btn-primary" onclick="handlePembayaran(${permohonan.id},'otorisator')">
                                 <i class="ki-filled ki-double-check"></i>
                             </a>
diff --git a/resources/views/penilai/components/print-out-sederhana.blade.php b/resources/views/penilai/components/print-out-sederhana.blade.php
index 7f329cc..3399acc 100644
--- a/resources/views/penilai/components/print-out-sederhana.blade.php
+++ b/resources/views/penilai/components/print-out-sederhana.blade.php
@@ -603,6 +603,56 @@
                     </table>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <table>
+                        <tr>
+                            <td width="25%" style="vertical-align: top;">Catatan yang Perlu
+                                Diperhatikan</td>
+                            <td width="1%" style="vertical-align: top;">:</td>
+                            <td style="vertical-align: top;">
+                                @php
+                                    $keterangan = $lpjData['keterangan_penilai'] ?? '';
+                                @endphp
+
+                                @if (!empty($keterangan))
+                                    @if (is_array($keterangan))
+                                        @foreach ($keterangan as $item)
+                                        <table style="width: 100%; border-collapse: collapse;">
+                                            <tr>
+                                                <td>
+                                                    @php
+                                                        $items_ = explode('- ', $item);
+                                                    @endphp
+                                                    @foreach ($items_ as $item_)
+                                                        @if(!empty($item_))
+                                                            - {{ trim($item_) }}<br>
+                                                        @endif
+                                                    @endforeach
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        @endforeach
+                                    @else
+                                        <table style="width: 100%; border-collapse: collapse;">
+                                            <tr>
+                                                <td>
+                                                    @php
+                                                        $items = explode('- ', $keterangan);
+                                                    @endphp
+                                                    @foreach ($items as $item)
+                                                        - {{ trim($item) }}<br>
+                                                    @endforeach
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    @endif
+                                @endif
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
         </table>
     </div>
     @if($permohonan->is_mig)
diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php
index eac1cf4..d121d8f 100644
--- a/resources/views/penilai/index.blade.php
+++ b/resources/views/penilai/index.blade.php
@@ -229,7 +229,7 @@
                             return `<span class="flex justify-center uppercase badge badge-sm badge-default">${data.penawaran?.status.replace(/-/g, ' ')}</span>`;
                         }
 
-                        //return `<span class="flex justify-center uppercase badge badge-sm badge-default">${data.status.replace(/-/g, ' ')}</span>`;
+                        return `<span class="flex justify-center uppercase badge badge-sm badge-default">${data.status.replace(/-/g, ' ')}</span>`;
                     },
                 },
                 actions: {
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 765a09e..36c5b50 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -159,11 +159,9 @@
 
                     @if ($dataHeader == 'pelaporan')
                         @php
-                            @php
-                                $lpj_ = optional(json_decode($permohonan->penilaian->lpj));
-                                $npw = $lpj_->total_nilai_pasar_wajar ?? 0;
-                                $npw = str_replace('.', '', $npw);
-                            @endphp
+                            $lpj_ = optional(json_decode($permohonan->penilai->lpj));
+                            $npw = $lpj_->total_nilai_pasar_wajar ?? 0;
+                            $npw = str_replace('.', '', $npw);
                         @endphp
                         <a class="btn btn-success"
                             href="{{ route('otorisator.view-laporan') }}?permohonanId={{ $permohonan->id }}&documentId={{ $documentId }}&jaminanId={{ $jenisJaminanId }}&statusLpj={{ true }}&header={{ $header ?? '' }}">
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index dd83876..d5020b3 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -5,17 +5,17 @@
 @endsection
 
 @section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <div class="card border border-agi-100 pb-2.5">
+    <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
+        <div class="pb-2.5 border card border-agi-100">
             @if(isset($permohonan->id))
             <div class="card-header bg-agi-50" id="basic_settings">
-                <div class="card-title flex flex-row gap-1.5">
+                <div class="flex flex-row gap-1.5 card-title">
                     <a href="{{ route('permohonan.edit',array_merge(request()->query(),['permohonan'=>$permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('permohonan.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Permohonan</a>
                     <a href="{{ route('debitur.edit',array_merge(request()->query(),['debitur'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Debitur</a>
                     <a href="{{ route('debitur.jaminan.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.jaminan.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Dokumen Jaminan</a>
                     <a href="{{ route('debitur.pemilik.index',array_merge(request()->query(),['id'=>$debitur->id,'permohonan_id' => $permohonan->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.pemilik.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Pemilk Jaminan</a>
                 </div>
-                <div class="flex items-center gap-2">
+                <div class="flex gap-2 items-center">
                     @if(isset($debitur->id) && !isset($permohonan->id))
                         <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create.debitur', $debitur->id) }}"> Buat Permohonan </a>
                     @endif
@@ -34,7 +34,7 @@
                     <h3 class="card-title">
                         {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan
                     </h3>
-                    <div class="flex items-center gap-2">
+                    <div class="flex gap-2 items-center">
                         <a href="{{ route('permohonan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
                     </div>
                 </div>
@@ -50,6 +50,33 @@
 
                     <input type="hidden" name="debiture_id" value="{{ $debitur->id }}">
 
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
+                        <label class="gap-1 form-label max-w-56">
+                            Cabang
+                            <span class="text-danger">*</span>
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            @if (auth()->user()->hasRole(['administrator','admin']))
+                                <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                    name="branch_id" id="branch_id">
+                                    <option value="">Pilih Cabang</option>
+                                    @foreach ($branches as $branch)
+                                        <option value="{{ $branch->id }}"
+                                            {{ (isset($debitur) && $branch->id == $debitur->branch_id) || old('branch_id') == $branch->id ? 'selected' : '' }}>
+                                            {{ $branch->name }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            @else
+                                <input type="hidden" name="branch_id" value="{{ auth()->user()->branch_id }}">
+                                <input type="text" class="w-full input" value="{{ auth()->user()->branch->name }}" readonly>
+                            @endif
+                            @error('branch_id')
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+
                     @php
                         $formFields = [
                             'tujuan_penilaian_id' => ['label' => 'Tujuan Penilaian', 'type' => 'select', 'options' => $tujuanPenilaian],
@@ -65,7 +92,7 @@
                     @endphp
 
                     @foreach($formFields as $field => $config)
-                        <div id="{{ $field }}_wrapper" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div id="{{ $field }}_wrapper" class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             <label class="form-label max-w-56">{{ $config['label'] }}</label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 @if($config['type'] === 'select')
@@ -85,14 +112,14 @@
                                            value="{{ old($field, $permohonan->$field ?? '') }}">
                                 @endif
                                 @error($field)
-                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    <em class="text-sm alert text-danger">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
                     @endforeach
 
                     @if(isset($permohonan) && $permohonan->status == 'revisi')
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             Catatan : <br>
                             <em class="text-red-500">{{ $permohonan->keterangan }} {{ $permohonan->registrasi_catatan }}</em>
                         </div>
diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php
index 15b57e2..0bd3892 100644
--- a/resources/views/permohonan/index.blade.php
+++ b/resources/views/permohonan/index.blade.php
@@ -22,7 +22,7 @@
                     <div class="flex flex-wrap gap-2.5">
                         <div class="h-[24px] border border-r-gray-200"></div>
                         <a class="btn btn-sm btn-light" href="{{ route('permohonan.export') }}"> Export to Excel </a>
-                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao']))
+                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao','admin']))
                             <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create') }}"> Tambah Permohonan </a>
                         @endif
                     </div>