memperbaiki konflik pada branch staging - andydev

app/Models/Permohonan.php

@@ -35,38 +35,52 @@ class Permohonan extends Base
         'region_id',
         // andy add
         'status_bayar',
-        'nilai_njop'
+        'nilai_njop',
+        // andy add
+        'registrasi_catatan',
+        'registrasi_by',
+        'registrasi_at',
+        'jenis_penilaian_id',
+        'region_id'
     ];
 
-    public function user(){
+    public function user()
+    {
         return $this->belongsTo(User::class);
     }
 
-    public function branch(){
+    public function branch()
+    {
         return $this->belongsTo(Branch::class);
     }
 
-    public function tujuanPenilaian(){
+    public function tujuanPenilaian()
+    {
         return $this->belongsTo(TujuanPenilaian::class);
     }
 
-    public function debiture(){
+    public function debiture()
+    {
         return $this->belongsTo(Debiture::class);
     }
 
-    public function documents(){
+    public function documents()
+    {
         return $this->hasMany(DokumenJaminan::class);
     }
 
-    public function nilaiPlafond(){
+    public function nilaiPlafond()
+    {
         return $this->belongsTo(NilaiPlafond::class);
     }
 
-    public function jenisFasilitasKredit(){
+    public function jenisFasilitasKredit()
+    {
         return $this->belongsTo(JenisFasilitasKredit::class);
     }
 
-    public function penilaian(){
+    public function penilaian()
+    {
         return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
     }
 }