diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php
index bcb66ce..87a50b8 100644
--- a/app/Http/Controllers/NocController.php
+++ b/app/Http/Controllers/NocController.php
@@ -63,14 +63,14 @@
             $permohonan = Permohonan::find(request()->get('permohonan_id'));
             if ($permohonan) {
                 $permohonan->status_bayar = request()->get('status_bayar');
-                if($permohonan->jenis_penilaian_id==2) {
+                if ($permohonan->jenis_penilaian_id == 2) {
                     $permohonan->status = $status;
                 }
                 $permohonan->save();
 
                 // andy add, update status penawaran.status='spk'
                 // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
-                if($permohonan->jenis_penilaian_id==2) {
+                if ($permohonan->jenis_penilaian_id == 2) {
                     PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
                         'status'     => $status,
                         'updated_by' => Auth::id(),
@@ -109,7 +109,7 @@
         /**
          * Display the specified resource.
          */
-        public function show($id) {}
+        public function show($id) { }
 
         /**
          * Show the form for editing the specified resource.
@@ -117,7 +117,7 @@
         public function edit($id)
         {
             $persetujuanPenawaran = PersetujuanPenawaran::where('id', $id)->with(
-                ['penawaran.detail', 'penawaran.permohonan.debiture','permohonan'],
+                ['penawaran.detail', 'penawaran.permohonan.debiture', 'permohonan'],
             )->first();
             return view('lpj::noc.form', compact('persetujuanPenawaran'));
         }
@@ -173,18 +173,20 @@
             $filteredRecords = $query->count();
 
             // Get the data for the current page
-            $data = $query
-                ->with(
-                    [
-                        'penawaran.permohonan.debiture',
-                        'penawaran.permohonan.branch',
-                        'permohonan.debiture',
-                        'permohonan.branch',
-                        'penawaran.detail',
-                        'penawaran.persetujuan',
-                    ],
-                )->get();
+            $data = $query->get();
 
+            $data = $data->map(function ($persetujuanPenawaran) {
+                return [
+                    'id'                   => $persetujuanPenawaran->id,
+                    'nomor_registrasi'     => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi,
+                    'nama_debitur'         => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name,
+                    'cabang'               => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name,
+                    'tanggal_setor'        => formatTanggalIndonesia($persetujuanPenawaran->created_at, true),
+                    'nominal_bayar'        => format_currency($persetujuanPenawaran->nominal_bayar ?? 0),
+                    'bukti_ksl'            => $persetujuanPenawaran->bukti_ksl ?? null,
+                    'tanggal_penyelesaian' => formatTanggalIndonesia($persetujuanPenawaran->updated_at, true),
+                ];
+            });
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));
diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php
index da4c090..e29eb0a 100644
--- a/app/Http/Controllers/PembayaranController.php
+++ b/app/Http/Controllers/PembayaranController.php
@@ -267,8 +267,7 @@ class PembayaranController extends Controller
                     $subquery->select('permohonan_id')
                         ->from('persetujuan_penawaran')
                         ->whereNotNull('permohonan_id');
-                })
-                    ->orWhere('status', 'revisi-pembayaran');
+                });
             });
 
 
diff --git a/app/Models/Analisa.php b/app/Models/Analisa.php
index 4134384..8266122 100644
--- a/app/Models/Analisa.php
+++ b/app/Models/Analisa.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaFactory;
 
-class Analisa extends Model
+class Analisa extends Base
 {
     use HasFactory;
     protected $table = 'analisa';
diff --git a/app/Models/AnalisaFakta.php b/app/Models/AnalisaFakta.php
index 63015a6..d1bb7e2 100644
--- a/app/Models/AnalisaFakta.php
+++ b/app/Models/AnalisaFakta.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaFaktaFactory;
 
-class AnalisaFakta extends Model
+class AnalisaFakta extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/AnalisaLingkungan.php b/app/Models/AnalisaLingkungan.php
index 59a2962..5129109 100644
--- a/app/Models/AnalisaLingkungan.php
+++ b/app/Models/AnalisaLingkungan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaLingkunganFactory;
 
-class AnalisaLingkungan extends Model
+class AnalisaLingkungan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/AnalisaTanahBagunan.php b/app/Models/AnalisaTanahBagunan.php
index 32c7791..21b4d85 100644
--- a/app/Models/AnalisaTanahBagunan.php
+++ b/app/Models/AnalisaTanahBagunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaTanahBagunanFactory;
 
-class AnalisaTanahBagunan extends Model
+class AnalisaTanahBagunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/AnalisaUnit.php b/app/Models/AnalisaUnit.php
index 4c0b3a7..5213b39 100644
--- a/app/Models/AnalisaUnit.php
+++ b/app/Models/AnalisaUnit.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaUnitFactory;
 
-class AnalisaUnit extends Model
+class AnalisaUnit extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/BentukTanah.php b/app/Models/BentukTanah.php
index 38729af..33a9fd9 100644
--- a/app/Models/BentukTanah.php
+++ b/app/Models/BentukTanah.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\BentukTanahFactory;
 
-class BentukTanah extends Model
+class BentukTanah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/BentukUnit.php b/app/Models/BentukUnit.php
index 0c93b1d..080ed6d 100644
--- a/app/Models/BentukUnit.php
+++ b/app/Models/BentukUnit.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\BentukUnitFactory;
 
-class BentukUnit extends Model
+class BentukUnit extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Denah.php b/app/Models/Denah.php
index 390b233..d3a566f 100644
--- a/app/Models/Denah.php
+++ b/app/Models/Denah.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\DenahFactory;
 
-class Denah extends Model
+class Denah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/FasilitasObjek.php b/app/Models/FasilitasObjek.php
index a8fcda6..7cf7b78 100644
--- a/app/Models/FasilitasObjek.php
+++ b/app/Models/FasilitasObjek.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\FasilitasObjekFactory;
 
-class FasilitasObjek extends Model
+class FasilitasObjek extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/FotoJaminan.php b/app/Models/FotoJaminan.php
index 940ecfe..e7df96b 100644
--- a/app/Models/FotoJaminan.php
+++ b/app/Models/FotoJaminan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\FotoJaminanFactory;
 
-class FotoJaminan extends Model
+class FotoJaminan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/FotoObjekJaminan.php b/app/Models/FotoObjekJaminan.php
index c344373..6a31313 100644
--- a/app/Models/FotoObjekJaminan.php
+++ b/app/Models/FotoObjekJaminan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\FotoObjekJaminanFactory;
 
-class FotoObjekJaminan extends Model
+class FotoObjekJaminan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/GolonganMasySekitar.php b/app/Models/GolonganMasySekitar.php
index a4d1f9a..45288b1 100644
--- a/app/Models/GolonganMasySekitar.php
+++ b/app/Models/GolonganMasySekitar.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\GolonganMasySekitarFactory;
 
-class GolonganMasySekitar extends Model
+class GolonganMasySekitar extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Inspeksi.php b/app/Models/Inspeksi.php
index e6d253d..38a6f05 100644
--- a/app/Models/Inspeksi.php
+++ b/app/Models/Inspeksi.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\InspeksiFactory;
 
-class Inspeksi extends Model
+class Inspeksi extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/JenisBangunan.php b/app/Models/JenisBangunan.php
index a4cd930..f4e9302 100644
--- a/app/Models/JenisBangunan.php
+++ b/app/Models/JenisBangunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\JenisBangunanFactory;
 
-class JenisBangunan extends Model
+class JenisBangunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/JenisKapal.php b/app/Models/JenisKapal.php
index 169d29d..96dec5f 100644
--- a/app/Models/JenisKapal.php
+++ b/app/Models/JenisKapal.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisKapalFactory;
 
-class JenisKapal extends Model
+class JenisKapal extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/JenisKendaraan.php b/app/Models/JenisKendaraan.php
index 1846e02..4328e71 100644
--- a/app/Models/JenisKendaraan.php
+++ b/app/Models/JenisKendaraan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisKendaraanFactory;
 
-class JenisKendaraan extends Model
+class JenisKendaraan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/JenisPenilaian.php b/app/Models/JenisPenilaian.php
index f072a82..7c2649b 100644
--- a/app/Models/JenisPenilaian.php
+++ b/app/Models/JenisPenilaian.php
@@ -5,7 +5,7 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
 use Modules\Lpj\Models\Penilaian;
-class JenisPenilaian extends Model
+class JenisPenilaian extends Base
 {
 
     /**
diff --git a/app/Models/JenisPesawat.php b/app/Models/JenisPesawat.php
index 226c8b0..9e08c68 100644
--- a/app/Models/JenisPesawat.php
+++ b/app/Models/JenisPesawat.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisPesawatFactory;
 
-class JenisPesawat extends Model
+class JenisPesawat extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/JenisUnit.php b/app/Models/JenisUnit.php
index 744ca80..2d47154 100644
--- a/app/Models/JenisUnit.php
+++ b/app/Models/JenisUnit.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\JenisUnitFactory;
 
-class JenisUnit extends Model
+class JenisUnit extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/KetinggianTanah.php b/app/Models/KetinggianTanah.php
index 9cd282d..2edbc5b 100644
--- a/app/Models/KetinggianTanah.php
+++ b/app/Models/KetinggianTanah.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KetinggianTanahFactory;
 
-class KetinggianTanah extends Model
+class KetinggianTanah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/KondisiBangunan.php b/app/Models/KondisiBangunan.php
index 0fa0f86..05aebb0 100644
--- a/app/Models/KondisiBangunan.php
+++ b/app/Models/KondisiBangunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KondisiBangunanFactory;
 
-class KondisiBangunan extends Model
+class KondisiBangunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/KondisiFisikTanah.php b/app/Models/KondisiFisikTanah.php
index bc3a33d..89b6907 100644
--- a/app/Models/KondisiFisikTanah.php
+++ b/app/Models/KondisiFisikTanah.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KondisiFisikTanahFactory;
 
-class KondisiFisikTanah extends Model
+class KondisiFisikTanah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/KonturTanah.php b/app/Models/KonturTanah.php
index ea53872..b5a4369 100644
--- a/app/Models/KonturTanah.php
+++ b/app/Models/KonturTanah.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KonturTanahFactory;
 
-class KonturTanah extends Model
+class KonturTanah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/LaluLintasLokasi.php b/app/Models/LaluLintasLokasi.php
index 0ab213a..ec2d286 100644
--- a/app/Models/LaluLintasLokasi.php
+++ b/app/Models/LaluLintasLokasi.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LaluLintasLokasiFactory;
 
-class LaluLintasLokasi extends Model
+class LaluLintasLokasi extends Base
 {
     use HasFactory;
     protected $table = 'lalu_lintas_lokasi';
diff --git a/app/Models/Lantai.php b/app/Models/Lantai.php
index 3330df1..8629cc9 100644
--- a/app/Models/Lantai.php
+++ b/app/Models/Lantai.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LokasiUnitFactory;
 
-class Lantai extends Model
+class Lantai extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/LantaiUnit.php b/app/Models/LantaiUnit.php
index b40a5c3..d96945b 100644
--- a/app/Models/LantaiUnit.php
+++ b/app/Models/LantaiUnit.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LantaiUnitFactory;
 
-class LantaiUnit extends Model
+class LantaiUnit extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Laporan.php b/app/Models/Laporan.php
index 5065294..b1f2320 100644
--- a/app/Models/Laporan.php
+++ b/app/Models/Laporan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\LaporanFactory;
 
-class Laporan extends Model
+class Laporan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Lingkungan.php b/app/Models/Lingkungan.php
index a7b55a2..bcd81bf 100644
--- a/app/Models/Lingkungan.php
+++ b/app/Models/Lingkungan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LingkunganFactory;
 
-class Lingkungan extends Model
+class Lingkungan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/MerupakanDaerah.php b/app/Models/MerupakanDaerah.php
index 983cc49..e436f93 100644
--- a/app/Models/MerupakanDaerah.php
+++ b/app/Models/MerupakanDaerah.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\MerupakanDaerahFactory;
 
-class MerupakanDaerah extends Model
+class MerupakanDaerah extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/ModelAlatBerat.php b/app/Models/ModelAlatBerat.php
index 63b9b0f..213a8ed 100644
--- a/app/Models/ModelAlatBerat.php
+++ b/app/Models/ModelAlatBerat.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\ModelAlatBeratFactory;
 
-class ModelAlatBerat extends Model
+class ModelAlatBerat extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/ObjekJaminan.php b/app/Models/ObjekJaminan.php
index 7b9f63a..093e80d 100644
--- a/app/Models/ObjekJaminan.php
+++ b/app/Models/ObjekJaminan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\ObjekJaminanFactory;
 
-class ObjekJaminan extends Model
+class ObjekJaminan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/PenawaranDetailTenderLog.php b/app/Models/PenawaranDetailTenderLog.php
index d29ff58..f1594bd 100644
--- a/app/Models/PenawaranDetailTenderLog.php
+++ b/app/Models/PenawaranDetailTenderLog.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 // use Modules\Lpj\Database\Factories\PenawaranDetailTenderFactory;
 
-class PenawaranDetailTenderLog extends Model
+class PenawaranDetailTenderLog extends Base
 {
     use HasFactory;
 
@@ -22,7 +22,7 @@ class PenawaranDetailTenderLog extends Model
     {
         return $this->belongsTo(PenawaranTender::class, 'penawaran_id', 'id');
     }
-    
+
     public function penawarandetail(): BelongsTo
     {
         return $this->belongsTo(PenawaranDetailTender::class, 'detail_penawaran_id', 'id');
diff --git a/app/Models/Penilai.php b/app/Models/Penilai.php
index 08cfbad..d1a75f8 100644
--- a/app/Models/Penilai.php
+++ b/app/Models/Penilai.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\PenilaiFactory;
 
-class Penilai extends Model
+class Penilai extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index ede4fc1..cf7cc3d 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -10,7 +10,7 @@ use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Usermanagement\Models\User;
 
-class Penilaian extends Model
+class Penilaian extends Base
 {
     /**
      * The attributes that are mass assignable.
diff --git a/app/Models/PenilaianTeam.php b/app/Models/PenilaianTeam.php
index adcd268..0b6079b 100644
--- a/app/Models/PenilaianTeam.php
+++ b/app/Models/PenilaianTeam.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PenilaianTeamFactory;
 
-class PenilaianTeam extends Model
+class PenilaianTeam extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Perizinan.php b/app/Models/Perizinan.php
index 34048d4..4f7c3c8 100644
--- a/app/Models/Perizinan.php
+++ b/app/Models/Perizinan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\PerizinanFactory;
 
-class Perizinan extends Model
+class Perizinan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/PerkerasanJalan.php b/app/Models/PerkerasanJalan.php
index 2c7b0b1..e34f29d 100644
--- a/app/Models/PerkerasanJalan.php
+++ b/app/Models/PerkerasanJalan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PerkerasanJalanFactory;
 
-class PerkerasanJalan extends Model
+class PerkerasanJalan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/PermohonanJaminan.php b/app/Models/PermohonanJaminan.php
index 86e4b3f..f72236c 100644
--- a/app/Models/PermohonanJaminan.php
+++ b/app/Models/PermohonanJaminan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PermohonanJaminanFactory;
 
-class PermohonanJaminan extends Model
+class PermohonanJaminan extends Base
 {
     use HasFactory;
     protected $table    = 'dokumen_jaminan';
diff --git a/app/Models/PosisiKavling.php b/app/Models/PosisiKavling.php
index 25e17bc..980c812 100644
--- a/app/Models/PosisiKavling.php
+++ b/app/Models/PosisiKavling.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PosisiKavlingFactory;
 
-class PosisiKavling extends Model
+class PosisiKavling extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/PosisiUnit.php b/app/Models/PosisiUnit.php
index 7b5a392..9f6d339 100644
--- a/app/Models/PosisiUnit.php
+++ b/app/Models/PosisiUnit.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\PosisiUnitFactory;
 
-class PosisiUnit extends Model
+class PosisiUnit extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Regions.php b/app/Models/Regions.php
index f5aef83..2bccee2 100644
--- a/app/Models/Regions.php
+++ b/app/Models/Regions.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\RegionsFactory;
 use Modules\Lpj\Models\Teams;
 
-class Regions extends Model
+class Regions extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/RuteJaminan.php b/app/Models/RuteJaminan.php
index 9b88940..8bae958 100644
--- a/app/Models/RuteJaminan.php
+++ b/app/Models/RuteJaminan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\RuteJaminanFactory;
 
-class RuteJaminan extends Model
+class RuteJaminan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SLA.php b/app/Models/SLA.php
deleted file mode 100644
index 3646abf..0000000
--- a/app/Models/SLA.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Models;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-
-class SLA extends Model
-{
-    use HasFactory;
-
-    protected $table = 'sla';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected $guarded = ['id'];
-}
diff --git a/app/Models/SaranaPelengkap.php b/app/Models/SaranaPelengkap.php
index 7d8e91a..31dbc1a 100644
--- a/app/Models/SaranaPelengkap.php
+++ b/app/Models/SaranaPelengkap.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SaranaPelengkapFactory;
 
-class SaranaPelengkap extends Model
+class SaranaPelengkap extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SifatBangunan.php b/app/Models/SifatBangunan.php
index 2997a7b..b85aabc 100644
--- a/app/Models/SifatBangunan.php
+++ b/app/Models/SifatBangunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SifatBangunanFactory;
 
-class SifatBangunan extends Model
+class SifatBangunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SpekBagunanAnalisa.php b/app/Models/SpekBagunanAnalisa.php
index 86cd6be..88e1cbd 100644
--- a/app/Models/SpekBagunanAnalisa.php
+++ b/app/Models/SpekBagunanAnalisa.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SpekBagunanAnalisaFactory;
 
-class SpekBagunanAnalisa extends Model
+class SpekBagunanAnalisa extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SpekBagunanAnalisaDetail.php b/app/Models/SpekBagunanAnalisaDetail.php
index 1c39184..1f1b8ae 100644
--- a/app/Models/SpekBagunanAnalisaDetail.php
+++ b/app/Models/SpekBagunanAnalisaDetail.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SpekBagunanAnalisaDetailFactory;
 
-class SpekBagunanAnalisaDetail extends Model
+class SpekBagunanAnalisaDetail extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SpekBangunan.php b/app/Models/SpekBangunan.php
index 39ca9c1..c3644dd 100644
--- a/app/Models/SpekBangunan.php
+++ b/app/Models/SpekBangunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SpekBangunanFactory;
 
-class SpekBangunan extends Model
+class SpekBangunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/SpekKategoritBangunan.php b/app/Models/SpekKategoritBangunan.php
index b756be0..449dff9 100644
--- a/app/Models/SpekKategoritBangunan.php
+++ b/app/Models/SpekKategoritBangunan.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\SpekKategoritBangunanFactory;
 
-class SpekKategoritBangunan extends Model
+class SpekKategoritBangunan extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/Teams.php b/app/Models/Teams.php
index 57c0775..ce3b2d5 100644
--- a/app/Models/Teams.php
+++ b/app/Models/Teams.php
@@ -10,7 +10,7 @@ use Modules\Lpj\Models\Regions;
 use Modules\Lpj\Models\Penilaian;
 
 
-class Teams extends Model
+class Teams extends Base
 {
     /**
      * The attributes that are mass assignable.
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
index 1eca705..9299bf6 100644
--- a/app/Models/TeamsUsers.php
+++ b/app/Models/TeamsUsers.php
@@ -8,7 +8,7 @@ use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\Penilaian;
 
-class TeamsUsers extends Model
+class TeamsUsers extends Base
 {
 
     /**
diff --git a/app/Models/TerletakArea.php b/app/Models/TerletakArea.php
index fc56c80..e6e4728 100644
--- a/app/Models/TerletakArea.php
+++ b/app/Models/TerletakArea.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\TerletakAreaFactory;
 
-class TerletakArea extends Model
+class TerletakArea extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/TingkatKeramaian.php b/app/Models/TingkatKeramaian.php
index 2c82169..575a16b 100644
--- a/app/Models/TingkatKeramaian.php
+++ b/app/Models/TingkatKeramaian.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\TingkatKeramaianFactory;
 
-class TingkatKeramaian extends Model
+class TingkatKeramaian extends Base
 {
     use HasFactory;
 
diff --git a/app/Models/ViewUnit.php b/app/Models/ViewUnit.php
index f72e3e8..dd3f17f 100644
--- a/app/Models/ViewUnit.php
+++ b/app/Models/ViewUnit.php
@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\ViewUnitFactory;
 
-class ViewUnit extends Model
+class ViewUnit extends Base
 {
     use HasFactory;
 
diff --git a/database/migrations/2024_08_12_024448_create_currencies_table.php b/database/migrations/2024_08_12_024448_create_currencies_table.php
deleted file mode 100644
index ec92b59..0000000
--- a/database/migrations/2024_08_12_024448_create_currencies_table.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-    use Illuminate\Database\Migrations\Migration;
-    use Illuminate\Database\Schema\Blueprint;
-    use Illuminate\Support\Facades\Schema;
-
-    return new class extends Migration {
-        /**
-         * Run the migrations.
-         */
-        public function up()
-        : void
-        {
-            Schema::create('currencies', function (Blueprint $table) {
-                $table->id();
-                $table->string('code', 3)->unique();
-                $table->string('name');
-                $table->integer('decimal_places')->default(2);
-                $table->boolean('status')->default(true)->nullable();
-                $table->timestamps();
-                $table->timestamp('authorized_at')->nullable();
-                $table->char('authorized_status', 1)->nullable();
-                $table->softDeletes();
-
-                $table->unsignedBigInteger('created_by')->nullable();
-                $table->unsignedBigInteger('updated_by')->nullable();
-                $table->unsignedBigInteger('deleted_by')->nullable();
-                $table->unsignedBigInteger('authorized_by')->nullable();
-            });
-        }
-
-        /**
-         * Reverse the migrations.
-         */
-        public function down()
-        : void
-        {
-            Schema::dropIfExists('currencies');
-        }
-    };
diff --git a/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php b/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php
index 730a0b1..414098b 100644
--- a/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php
+++ b/database/migrations/2024_10_15_101204_create_detail_penawaran_logs_table.php
@@ -21,10 +21,10 @@ return new class extends Migration
             $table->string('dokumen_persetujuan')->nullable();
             $table->boolean('status')->nullable();
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-            $table->timestamps();
-            $table->timestamp('deleted_at')->nullable();
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
diff --git a/database/migrations/2024_10_16_153543_create_analisa_table.php b/database/migrations/2024_10_16_153543_create_analisa_table.php
index 2a86af2..5004d6a 100644
--- a/database/migrations/2024_10_16_153543_create_analisa_table.php
+++ b/database/migrations/2024_10_16_153543_create_analisa_table.php
@@ -19,12 +19,12 @@ return new class extends Migration
         $table->string('luas');
         $table->unsignedBigInteger('jenis_jaminan_id');
         $table->char('authorized_status', 1)->nullable();
+        $table->timestamps();
         $table->timestamp('authorized_at')->nullable();
         $table->unsignedBigInteger('authorized_by')->nullable();
-        $table->timestamps();
+        $table->softDeletes();
         $table->unsignedBigInteger('created_by')->nullable();
         $table->unsignedBigInteger('updated_by')->nullable();
-        $table->timestamp('deleted_at')->nullable();
         $table->unsignedBigInteger('deleted_by')->nullable();
     });
 }
diff --git a/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php b/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
index 2c0cf23..e99bf6d 100644
--- a/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
+++ b/database/migrations/2024_10_16_153558_create_analisa_tanah_bangunan_table.php
@@ -29,14 +29,12 @@ return new class extends Migration
             $table->string('sifat_bangunan');
             $table->string('sarana_pelengkap');
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps();
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153613_create_analisa_unit_table.php b/database/migrations/2024_10_16_153613_create_analisa_unit_table.php
index 7638518..2592687 100644
--- a/database/migrations/2024_10_16_153613_create_analisa_unit_table.php
+++ b/database/migrations/2024_10_16_153613_create_analisa_unit_table.php
@@ -25,14 +25,12 @@ return new class extends Migration
             $table->string('bentuk_unit');
 
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps();
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153727_create_spek_bagunan_analisa_table.php b/database/migrations/2024_10_16_153727_create_spek_bagunan_analisa_table.php
index 9da658b..a1efa9a 100644
--- a/database/migrations/2024_10_16_153727_create_spek_bagunan_analisa_table.php
+++ b/database/migrations/2024_10_16_153727_create_spek_bagunan_analisa_table.php
@@ -19,15 +19,13 @@ return new class extends Migration
             $table->unsignedBigInteger('analisa_tanah_bangunan_id');
             $table->foreign('analisa_tanah_bangunan_id')->references('id')->on('analisa_tanah_bangunan');
 
-            $table->char('authorized_status', 1);
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps();
-            $table->unsignedBigInteger('created_by');
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153743_create_spek_bagunan_analisa_detail_table.php b/database/migrations/2024_10_16_153743_create_spek_bagunan_analisa_detail_table.php
index e3f190b..8c39da9 100644
--- a/database/migrations/2024_10_16_153743_create_spek_bagunan_analisa_detail_table.php
+++ b/database/migrations/2024_10_16_153743_create_spek_bagunan_analisa_detail_table.php
@@ -19,15 +19,13 @@ return new class () extends Migration {
             $table->unsignedBigInteger('spek_bangunan_analisa_id');
             $table->foreign('spek_bangunan_analisa_id')->references('id')->on('spek_bagunan_analisa');
 
-            $table->char('authorized_status', 1);
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps();
-            $table->unsignedBigInteger('created_by');
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153811_create_analisa_fakta_table.php b/database/migrations/2024_10_16_153811_create_analisa_fakta_table.php
index 7e05782..58f9252 100644
--- a/database/migrations/2024_10_16_153811_create_analisa_fakta_table.php
+++ b/database/migrations/2024_10_16_153811_create_analisa_fakta_table.php
@@ -37,15 +37,13 @@ return new class () extends Migration {
             $table->string('lng');
             $table->text('keterangan');
 
-            $table->char('authorized_status', 1);
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
-            $table->unsignedBigInteger('created_by');
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153831_create_analisa_lingkungan_table.php b/database/migrations/2024_10_16_153831_create_analisa_lingkungan_table.php
index e0c5e22..10aa119 100644
--- a/database/migrations/2024_10_16_153831_create_analisa_lingkungan_table.php
+++ b/database/migrations/2024_10_16_153831_create_analisa_lingkungan_table.php
@@ -30,15 +30,13 @@ return new class () extends Migration {
             $table->string('merupakan_daerah');
             $table->string('fasilitas_dekat_object');
 
-            $table->char('authorized_status', 1);
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
-            $table->unsignedBigInteger('created_by');
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153841_create_denah_table.php b/database/migrations/2024_10_16_153841_create_denah_table.php
index 71475ff..273ee33 100644
--- a/database/migrations/2024_10_16_153841_create_denah_table.php
+++ b/database/migrations/2024_10_16_153841_create_denah_table.php
@@ -20,14 +20,12 @@ return new class () extends Migration {
             $table->string('luas');
             $table->unsignedBigInteger('jenis_jaminan_id');
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153902_create_foto_jaminan_table.php b/database/migrations/2024_10_16_153902_create_foto_jaminan_table.php
index 3c7f514..8b793e2 100644
--- a/database/migrations/2024_10_16_153902_create_foto_jaminan_table.php
+++ b/database/migrations/2024_10_16_153902_create_foto_jaminan_table.php
@@ -18,14 +18,12 @@ return new class () extends Migration {
             $table->string('pendamping');
             $table->unsignedBigInteger('jenis_jaminan_id');
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153918_create_objek_jaminan_table.php b/database/migrations/2024_10_16_153918_create_objek_jaminan_table.php
index 3d02a38..5bfde6d 100644
--- a/database/migrations/2024_10_16_153918_create_objek_jaminan_table.php
+++ b/database/migrations/2024_10_16_153918_create_objek_jaminan_table.php
@@ -21,14 +21,12 @@ return new class () extends Migration {
 
             $table->unsignedBigInteger('jenis_jaminan_id');
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_153945_create_lingkungan_table.php b/database/migrations/2024_10_16_153945_create_lingkungan_table.php
index 58f4289..8363ee1 100644
--- a/database/migrations/2024_10_16_153945_create_lingkungan_table.php
+++ b/database/migrations/2024_10_16_153945_create_lingkungan_table.php
@@ -20,14 +20,12 @@ return new class () extends Migration {
             $table->string('foto_linkungan');
 
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps();
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_16_155227_create_rute_jaminan_table.php b/database/migrations/2024_10_16_155227_create_rute_jaminan_table.php
index 6db988e..35fb839 100644
--- a/database/migrations/2024_10_16_155227_create_rute_jaminan_table.php
+++ b/database/migrations/2024_10_16_155227_create_rute_jaminan_table.php
@@ -21,14 +21,12 @@ return new class () extends Migration {
             $table->string('foto_rute');
 
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-
-            $table->timestamps(); // created_at and updated_at
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
         });
     }
diff --git a/database/migrations/2024_10_22_064209_create_lantai_unit_table.php b/database/migrations/2024_10_22_064209_create_lantai_unit_table.php
index bf3c8c0..243f75b 100644
--- a/database/migrations/2024_10_22_064209_create_lantai_unit_table.php
+++ b/database/migrations/2024_10_22_064209_create_lantai_unit_table.php
@@ -18,13 +18,12 @@ return new class extends Migration
             $table->string('foto_lantai_unit');
 
             $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-            $table->timestamps();
+            $table->softDeletes();
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
-
-            $table->timestamp('deleted_at')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
 
         });
diff --git a/database/migrations/2024_10_28_095337_create_s_l_as_table.php b/database/migrations/2024_10_28_095337_create_s_l_as_table.php
deleted file mode 100644
index bf5549c..0000000
--- a/database/migrations/2024_10_28_095337_create_s_l_as_table.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('sla', function (Blueprint $table) {
-            $table->id();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('sla');
-    }
-};
diff --git a/database/migrations/2024_11_01_081225_create_label_name_inspeksi_table.php b/database/migrations/2024_11_01_081225_create_label_name_inspeksi_table.php
deleted file mode 100644
index 814024d..0000000
--- a/database/migrations/2024_11_01_081225_create_label_name_inspeksi_table.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('label_name_inspeksi', function (Blueprint $table) {
-            $table->id();
-            
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('label_name_inspeksi');
-    }
-};
diff --git a/resources/views/noc/index.blade.php b/resources/views/noc/index.blade.php
index 65269c7..b2867c4 100644
--- a/resources/views/noc/index.blade.php
+++ b/resources/views/noc/index.blade.php
@@ -123,50 +123,19 @@
                             },
                         },
                         nomor_registrasi: {
-                            title: 'Nomor Registrasi',
-                            render: (item, data) => {
-                                if(data.permohonan) {
-                                    return `${data.permohonan.nomor_registrasi}`;
-                                } else if(data.penawaran) {
-                                    return `${data.penawaran.permohonan.nomor_registrasi}`;
-                                }
-                                return '';
-                            },
+                            title: 'Nomor Registrasi'
                         },
                         nama_debitur: {
                             title: 'Nama Debitur',
-                            render: (item, data) => {
-                                if(data.permohonan) {
-                                    return `${data.permohonan.debiture.name}`;
-                                } else if(data.penawaran) {
-                                    return `${data.penawaran.permohonan.debiture.name}`;
-                                }
-                                return '';
-
-                            },
                         },
                         cabang: {
                             title: 'Cabang',
-                            render: (item, data) => {
-                                if(data.permohonan) {
-                                    return `${data.permohonan.branch.name}`;
-                                } else if(data.penawaran) {
-                                    return `${data.penawaran.permohonan.branch.name}`;
-                                }
-                                return '';
-                            },
                         },
                         tanggal_setor: {
                             title: 'Tanggal Setor',
-                            render: (item, data) => {
-                                return `${window.formatTanggalIndonesia(data.created_at)}`;
-                            },
                         },
                         nominal_bayar: {
                             title: 'Nominal Bayar',
-                            render: (item, data) => {
-                                return `${window.formatRupiah(data.nominal_bayar)}`;
-                            },
                         },
                         bukti_ksl: {
                             title: 'Bukti KSL',
@@ -182,12 +151,6 @@
                         },
                         tanggal_penyelesaian: {
                             title: 'Tanggal Penyelesaian',
-                            render: (item, data) => {
-                                if(data.status==1) {
-                                    return `${window.formatTanggalIndonesia(data.updated_at)}`;
-                                }
-                                return "-";
-                            },
                         },
                         actions: {
                             title: 'Action',