memperbaiki konflik dari branch staging

app/Models/Branch.php

@@ -1,16 +1,16 @@
 <?php
 
-    namespace Modules\Lpj\Models;
+namespace Modules\Lpj\Models;
 
-    use Modules\Lpj\Database\Factories\BranchFactory;
+use Modules\Lpj\Database\Factories\BranchFactory;
 
-    class Branch extends Base
+class Branch extends Base
+{
+    protected $table    = 'branches';
+    protected $fillable = ['code', 'name', 'status', 'authorized_at', 'authorized_status', 'authorized_by'];
+
+    public function debitures()
     {
-        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');
-        }
+        return $this->hasMany(Debiture::class, 'branch_id', 'id');
     }
+}

app/Models/Debiture.php

@@ -56,4 +56,8 @@
             return $this->belongsTo(Village::class, 'village_code', 'code');
         }
 
+        public function documents(){
+            return $this->hasMany(DokumenJaminan::class);
+        }
+
     }

app/Models/DetailDokumenJaminan.php

@@ -0,0 +1,34 @@
+<?php
+
+    namespace Modules\Lpj\Models;
+
+    use Modules\Location\Models\City;
+    use Modules\Location\Models\District;
+    use Modules\Location\Models\Province;
+    use Modules\Location\Models\Village;
+    use Modules\Lpj\Database\Factories\DokumenJaminanFactory;
+
+    class DetailDokumenJaminan extends Base
+    {
+        protected $table    = 'detail_dokumen_jaminan';
+        protected $fillable = [
+            'dokumen_jaminan_id',
+            'jenis_legalitas_jaminan_id',
+            'name',
+            'dokumen_jaminan',
+            'keterangan',
+
+            'status',
+            'authorized_at',
+            'authorized_status',
+            'authorized_by',
+        ];
+
+        public function jenisLegalitasJaminan(){
+            return $this->belongsTo(JenisLegalitasJaminan::class, 'jenis_legalitas_jaminan_id', 'id');
+        }
+
+        public function dokumenJaminan(){
+            return $this->belongsTo(DokumenJaminan::class, 'dokumen_jaminan_id', 'id');
+        }
+    }

app/Models/DokumenJaminan.php

@@ -16,10 +16,6 @@
             'permohonan_id',
             'pemilik_jaminan_id',
             'jenis_jaminan_id',
-            'jenis_legalitas_jaminan_id',
-            'name',
-            'dokumen_jaminan',
-            'keterangan',
             'province_code',
             'city_code',
             'district_code',
@@ -64,11 +60,11 @@
             return $this->belongsTo(JenisJaminan::class, 'jenis_jaminan_id', 'id');
         }
 
-        public function jenisLegalitasJaminan(){
-            return $this->belongsTo(JenisLegalitasJaminan::class, 'jenis_legalitas_jaminan_id', 'id');
-        }
-
         public function permohonan(){
             return $this->belongsTo(Permohonan::class, 'permohonan_id', 'id');
         }
+
+        public function detail(){
+            return $this->hasMany(DetailDokumenJaminan::class, 'dokumen_jaminan_id', 'id');
+        }
     }

app/Models/IjinUsaha.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class IjinUsaha extends Model
+{
+    use HasFactory;
+
+    protected $table = 'ijin_usaha';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = ['code', 'name'];
+}

app/Models/JenisAset.php

@@ -1,11 +1,11 @@
 <?php
 
-    namespace Modules\Lpj\Models;
+namespace Modules\Lpj\Models;
 
-    use Modules\Lpj\Database\Factories\JenisAsetFactory;
+use Modules\Lpj\Database\Factories\JenisAsetFactory;
 
-    class JenisAset extends Base
-    {
-        protected $table    = 'jenis_aset';
-        protected $fillable = ['code', 'name'];
-    }
+class JenisAset extends Base
+{
+    protected $table    = 'jenis_aset';
+    protected $fillable = ['code', 'name'];
+}

app/Models/JenisJaminan.php

@@ -1,11 +1,9 @@
 <?php
 
-    namespace Modules\Lpj\Models;
+namespace Modules\Lpj\Models;
 
-    use Modules\Lpj\Database\Factories\JenisJaminanFactory;
-
-    class JenisJaminan extends Base
-    {
-        protected $table    = 'jenis_jaminan';
-        protected $fillable = ['code', 'name'];
-    }
+class JenisJaminan extends Base
+{
+    protected $table    = 'jenis_jaminan';
+    protected $fillable = ['code', 'name', 'slug', 'jenis_legalitas_jaminan_id'];
+}

app/Models/JenisLaporan.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\JenisLaporanFactory;
+
+class JenisLaporan extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+
+    // Define the table if not using default table naming
+    protected $table = 'jenis_laporan';
+
+
+    protected $fillable = ['code', 'name'];
+}

app/Models/JenisLegalitasJaminan.php

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

app/Models/JenisPenilaian.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
+use Modules\Lpj\Models\Penilaian;
+class JenisPenilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'jenis_penilaian';
+
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by',
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class , 'jenis_penilaian_id', 'id');
+    }
+
+}

app/Models/KJPP.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Location\Models\Province;
+
+// use Modules\Lpj\Database\Factories\KJPPFactory;
+
+class KJPP extends Model
+{
+    use HasFactory;
+
+    // Define the table if not using default table naming
+    protected $table = 'kjpp';
+
+    /**
+     * 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'
+    ];
+}

app/Models/PenawaranTender.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class PenawaranTender extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'penawaran';
+
+    protected $guarded = ['id'];
+}

app/Models/Penilaian.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\PenilaianFactory;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Usermanagement\Models\User;
+
+
+class Penilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'penilaian';
+    protected $fillable = [
+        'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
+        'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
+        'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function jenis_penilaian(){
+        return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
+    }
+
+    public function teams(){
+        return $this->belongsTo(Teams::class, 'teams_id', 'id');
+    }
+
+    public function users(){
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+
+    public function userPenilai(){
+        return $this->belongsTo(User::class, 'penilaian_id', 'id');
+    }
+
+    public function userSurveyor(){
+        return $this->belongsTo(User::class, 'surveyor_id', 'id');
+    }
+
+    public function userPenilaiSurveyor(){
+        return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
+    }
+
+    public function permohonan(){
+        return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
+
+}

app/Models/Permohonan.php

@@ -6,6 +6,8 @@ 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
 {
@@ -17,6 +19,10 @@ class Permohonan extends Base
         'branch_id',
         'tujuan_penilaian_id',
         'debiture_id',
+        'keterangan',
+        'dokumen',
+        'jenis_fasilitas_kredit_id',
+        'nilai_plafond_id',
         'status',
         'authorized_at',
         'authorized_status',
@@ -26,7 +32,10 @@ class Permohonan extends Base
         'registrasi_by',
         'registrasi_at',
         'jenis_penilaian_id',
-        'region_id'
+        'region_id',
+        // andy add
+        'status_bayar',
+        'nilai_njop'
     ];
 
     public function user(){
@@ -48,4 +57,16 @@ class Permohonan extends Base
     public function documents(){
         return $this->hasMany(DokumenJaminan::class);
     }
+
+    public function nilaiPlafond(){
+        return $this->belongsTo(NilaiPlafond::class);
+    }
+
+    public function jenisFasilitasKredit(){
+        return $this->belongsTo(JenisFasilitasKredit::class);
+    }
+
+    public function penilaian(){
+        return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
+    }
 }

app/Models/Regions.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\RegionsFactory;
+use Modules\Lpj\Models\Teams;
+
+class Regions extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'regions';
+
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
+    ];
+
+    public function teams(){
+        return $this->hasMany(Teams::class, 'regions_id', 'id');
+    }
+}

app/Models/Teams.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\TeamsFactory;
+use Modules\Lpj\Models\TeamsUsers;
+use Modules\Lpj\Models\Regions;
+use Modules\Lpj\Models\Penilaian;
+
+
+class Teams extends Model
+{
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams';
+    protected $fillable = [
+        'regions_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at',
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
+        'deleted_at', 'deleted_by'
+    ];
+
+    public function regions(){
+        return $this->belongsTo(Regions::class, 'regions_id', 'id');
+    }
+
+    public function teamsUsers(){
+        return $this->hasMany(TeamsUsers::class, 'teams_id', 'id');
+    }
+
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class, 'teams_id', 'id');
+    }
+
+
+
+}
+

app/Models/TeamsUsers.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\TeamsUsersFactory;
+use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Models\Teams;
+
+class TeamsUsers extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams_users';
+    protected $fillable = [
+        'teams_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
+        'deleted_at', 'deleted_by'
+    ];
+
+    public function team()
+    {
+        return $this->belongsTo(Teams::class, 'teams_id', 'id');
+    }
+
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+}

app/Models/TujuanPenilaianKJPP.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\TujuanPenilaianKJPPFactory;
+
+class TujuanPenilaianKJPP extends Model
+{
+    use HasFactory;
+
+    protected $table = 'tujuan_penilaian_kjpp';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = ['code', 'name'];
+}