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

This commit is contained in:
2024-10-29 14:10:47 +07:00
31 changed files with 2112 additions and 1409 deletions

View File

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

View File

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

View File

@@ -1,86 +1,82 @@
<?php
namespace Modules\Lpj\Models;
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;
use Modules\Lpj\Database\Factories\PermohonanFactory;
use Modules\Usermanagement\Models\User;
class Permohonan extends Base
{
protected $table = 'permohonan';
protected $fillable = [
'nomor_registrasi',
'tanggal_permohonan',
'user_id',
'branch_id',
'tujuan_penilaian_id',
'debiture_id',
'keterangan',
'dokumen',
'jenis_fasilitas_kredit_id',
'nilai_plafond_id',
'status',
'authorized_at',
'authorized_status',
'authorized_by',
// andy add
'registrasi_catatan',
'registrasi_by',
'registrasi_at',
'jenis_penilaian_id',
'region_id',
// andy add
'status_bayar',
'nilai_njop',
// andy add
'registrasi_catatan',
'registrasi_by',
'registrasi_at',
'jenis_penilaian_id',
'region_id'
];
public function user()
class Permohonan extends Base
{
return $this->belongsTo(User::class);
}
protected $table = 'permohonan';
protected $fillable = [
'nomor_registrasi',
'tanggal_permohonan',
'user_id',
'branch_id',
'tujuan_penilaian_id',
'debiture_id',
'keterangan',
'dokumen',
'jenis_fasilitas_kredit_id',
'nilai_plafond_id',
'status',
'authorized_at',
'authorized_status',
'authorized_by',
// andy add
'registrasi_catatan',
'registrasi_by',
'registrasi_at',
'jenis_penilaian_id',
'region_id',
// andy add
'status_bayar',
'nilai_njop',
// andy add
'registrasi_catatan',
'registrasi_by',
'registrasi_at',
'jenis_penilaian_id',
'region_id',
];
public function branch()
{
return $this->belongsTo(Branch::class);
}
public function user()
{
return $this->belongsTo(User::class);
}
public function tujuanPenilaian()
{
return $this->belongsTo(TujuanPenilaian::class);
}
public function branch()
{
return $this->belongsTo(Branch::class);
}
public function debiture()
{
return $this->belongsTo(Debiture::class);
}
public function tujuanPenilaian()
{
return $this->belongsTo(TujuanPenilaian::class);
}
public function documents()
{
return $this->hasMany(DokumenJaminan::class);
}
public function debiture()
{
return $this->belongsTo(Debiture::class);
}
public function nilaiPlafond()
{
return $this->belongsTo(NilaiPlafond::class);
}
public function documents()
{
return $this->hasMany(DokumenJaminan::class);
}
public function jenisFasilitasKredit()
{
return $this->belongsTo(JenisFasilitasKredit::class);
}
public function nilaiPlafond()
{
return $this->belongsTo(NilaiPlafond::class);
}
public function penilaian()
{
return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
public function jenisFasilitasKredit()
{
return $this->belongsTo(JenisFasilitasKredit::class);
}
public function penilaian()
{
return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
}
}
}