Merge branch 'staging' into feature/senior-officer

app/Models/DetailDokumenJaminan.php

@@ -16,6 +16,7 @@
             'jenis_legalitas_jaminan_id',
             'name',
             'dokumen_jaminan',
+            'dokumen_nomor',
             'keterangan',
             'details',
             'status',

app/Models/KJPP.php

@@ -18,29 +18,5 @@ class KJPP extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = [
-        'code',
-        'name',
-        'jenis_kantor',
-        'nomor_ijin_usaha',
-        'province_code',
-        'city_code',
-        'district_code',
-        'village_code',
-        'address',
-        'postal_code',
-        'nomor_telepon_kantor',
-        'email_kantor',
-        'nama_pimpinan',
-        'nomor_hp_pimpinan',
-        'nama_pic_reviewer',
-        'nomor_hp_pic_reviewer',
-        'nama_pic_admin',
-        'nomor_hp_pic_admin',
-        'nama_pic_marketing',
-        'nomor_hp_pic_marketing',
-        'ijin_usaha_id',
-        'jenis_aset_id',
-        'attachment'
-    ];
+    protected $guarded = ['id'];
 }

app/Models/PenawaranTender.php

@@ -32,9 +32,9 @@ class PenawaranTender extends Model
     }
 
     // menambahkan relasi tujuan penilaian KJPP
-    public function tujuanPenilaianKJPP()
+    public function tujuanPenilaianKjpp()
     {
-        return $this->hasMany(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id');
+        return $this->belongsTo(TujuanPenilaianKJPP::class, 'tujuan_penilaian_kjpp_id','id');
     }
 
     public function permohonan()
@@ -46,4 +46,6 @@ class PenawaranTender extends Model
     {
         return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
     }
+
+
 }

app/Models/Permohonan.php

@@ -89,4 +89,8 @@ class Permohonan extends Base
     {
         return $this->belongsTo(Regions::class,  'region_id');
     }
+
+    public function penawaran(){
+        return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
 }

app/Models/PermohonanHistory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\PermohonanHistoryFactory;
+
+class PermohonanHistory extends Base
+{
+    protected $fillable = [
+        'permohonan_id',
+        'status',
+        'keterangan',
+        'before_request',
+        'after_request',
+        'file_path',
+        'user_id'
+    ];
+
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}