Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-11-05 08:38:22 +07:00
130 changed files with 8934 additions and 2169 deletions

View File

@@ -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()