Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

app/Http/Controllers/NocController.php

@@ -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'));

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');
+                });
             });
 
 

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';

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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
 {
 
     /**

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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';

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.

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;
 

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;
 

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;
 

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';

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;
 

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;
 

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;
 

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;
 

app/Models/SLA.php

@@ -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'];
-}

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.

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
 {
 
     /**

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;
 

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;
 

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;
 

database/migrations/2024_08_12_024448_create_currencies_table.php

@@ -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');
-        }
-    };

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();

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();
     });
 }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
         });
     }

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();
 
         });

database/migrations/2024_10_28_095337_create_s_l_as_table.php

@@ -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');
-    }
-};

database/migrations/2024_11_01_081225_create_label_name_inspeksi_table.php

@@ -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');
-    }
-};

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',