Merge branch 'staging' into feature/senior-officer

app/Models/Branch.php

@@ -2,13 +2,10 @@
 
 namespace Modules\Lpj\Models;
 
-use Modules\Lpj\Database\Factories\BranchFactory;
+use Modules\Basicdata\Models\Branch as BasicdataBranch;
 
-class Branch extends Base
+class Branch extends BasicdataBranch
 {
-    protected $table    = 'branches';
-    protected $fillable = ['code', 'name', 'status', 'authorized_at', 'authorized_status', 'authorized_by'];
-
     public function debitures()
     {
         return $this->hasMany(Debiture::class, 'branch_id', 'id');

app/Models/Currency.php

@@ -1,20 +0,0 @@
-<?php
-
-    namespace Modules\Lpj\Models;
-
-    use Modules\Lpj\Database\Factories\CurrencyFactory;
-
-    class Currency extends Base
-    {
-        protected $table = 'currencies';
-
-        protected $fillable = [
-            'code',
-            'name',
-            'decimal_places',
-            'status',
-            'authorized_at',
-            'authorized_status',
-            'authorized_by'
-        ];
-    }

app/Models/DetailDokumenJaminan.php

@@ -17,7 +17,7 @@
             'name',
             'dokumen_jaminan',
             'keterangan',
-
+            'details',
             'status',
             'authorized_at',
             'authorized_status',

app/Models/JenisLaporan.php

@@ -19,4 +19,9 @@ class JenisLaporan extends Model
 
 
     protected $fillable = ['code', 'name'];
+
+    public function penawaran()
+    {
+        return $this->hasMany(PenawaranTender::class, 'jenis_laporan_id', 'id');
+    }
 }

app/Models/JenisLegalitasJaminan.php

@@ -7,5 +7,5 @@
     class JenisLegalitasJaminan extends Base
     {
         protected $table    = 'jenis_legalitas_jaminan';
-        protected $fillable = ['code', 'name','slug'];
+        protected $fillable = ['code', 'name','slug','custom_field','custom_field_type'];
     }

app/Models/PemilikJaminan.php

@@ -30,7 +30,8 @@ class PemilikJaminan extends Base
         'status',
         'authorized_at',
         'authorized_status',
-        'authorized_by'
+        'authorized_by',
+        'detail_sertifikat',
     ];
 
     public function province()

app/Models/PenawaranDetailTenderLog.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+// use Modules\Lpj\Database\Factories\PenawaranDetailTenderFactory;
+
+class PenawaranDetailTenderLog extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'detail_penawaran_logs';
+
+    protected $guarded = ['id'];
+
+    public function penawaran(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranTender::class, 'penawaran_id', 'id');
+    }
+    
+    public function penawarandetail(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranDetailTender::class, 'detail_penawaran_id', 'id');
+    }
+}

app/Models/PenawaranTender.php

@@ -36,4 +36,14 @@ class PenawaranTender extends Model
     {
         return $this->hasMany(TujuanPenilaianKJPP::class, 'id', 'tujuan_penilaian_kjpp_id');
     }
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
+    public function jenisLaporan()
+    {
+        return $this->belongsTo(JenisLaporan::class, 'jenis_laporan_id', 'id');
+    }
 }

app/Models/Permohonan.php

@@ -2,16 +2,12 @@
 
 namespace Modules\Lpj\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PermohonanFactory;
 use Modules\Usermanagement\Models\User;
-use Modules\Lpj\Models\TujuanPenilaian;
-use Modules\Lpj\Models\JenisFasilitasKredit;
 
 class Permohonan extends Base
 {
-    protected $table = 'permohonan';
+    protected $table    = 'permohonan';
     protected $fillable = [
         'nomor_registrasi',
         'tanggal_permohonan',
@@ -41,7 +37,7 @@ class Permohonan extends Base
         'registrasi_by',
         'registrasi_at',
         'jenis_penilaian_id',
-        'region_id'
+        'region_id',
     ];
 
     public function user()
@@ -81,7 +77,12 @@ class Permohonan extends Base
 
     public function penilaian()
     {
-        return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
+        return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
+    public function penawaranTender()
+    {
+        return $this->hasMany(PenawaranTender::class, 'nomor_registrasi');
     }
 
     public function region()

app/Models/SLA.php

@@ -0,0 +1,18 @@
+<?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/Spk.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+class Spk extends Base
+{
+    protected $table    = 'arah_mata_angin';
+    protected $fillable = ['name','authorized_at','authorized_status','authorized_by'];
+}