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

app/Models/Permohonan.php

@@ -163,4 +163,8 @@
         {
             return $this->hasMany(DokumenJaminan::class);
         }
+
+        public function pembatalan(){
+            return $this->hasMany(PermohonanPembatalan::class);
+        }
     }

app/Models/PermohonanPembatalan.php

@@ -0,0 +1,50 @@
+<?php
+
+    namespace Modules\Lpj\Models;
+
+    use Illuminate\Database\Eloquent\Factories\HasFactory;
+    use Illuminate\Database\Eloquent\Model;
+    use Illuminate\Database\Eloquent\SoftDeletes;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Usermanagement\Models\User;
+
+    class PermohonanPembatalan extends Base
+    {
+
+        protected $table = 'permohonan_pembatalan';
+
+        protected $fillable = [
+            'permohonan_id',
+            'alasan_pembatalan',
+            'file_pembatalan',
+            'status',
+            'keterangan',
+            'authorized_at',
+            'authorized_status',
+            'created_by',
+            'updated_by',
+            'deleted_by',
+            'authorized_by',
+        ];
+
+        protected $dates = [
+            'created_at',
+            'updated_at',
+            'deleted_at',
+            'authorized_at',
+        ];
+
+        protected $casts = [
+            'authorized_status' => 'string',
+        ];
+
+        // Relationship with Permohonan
+        public function permohonan()
+        {
+            return $this->belongsTo(Permohonan::class, 'permohonan_id');
+        }
+
+        public function creator(){
+            return $this->belongsTo(User::class, 'created_by');
+        }
+    }

app/Models/SpekBangunan.php

@@ -20,7 +20,7 @@ class SpekBangunan extends Model
 
 
     public function bangunanKategori(){
-        return $this->belongsTo(SpekKategoriBangunan::class, 'spek_kategori_bangunan_id');
+        return $this->belongsTo(SpekKategoritBangunan::class, 'spek_kategori_bangunan_id');
     }
 
     protected static function newFactory(): SpekBangunanFactory