Continue dev on pampasan module

2025-09-17 12:38:51 +08:00
parent 0a290029a5
commit 6d80afed8f
6 changed files with 289 additions and 1 deletions
@@ -32,6 +32,10 @@ class Palsu extends Model
        'untungonepercent',
        'untungcajlain',
        'pembiayaan',
+<<<<<<< HEAD
+=======
+        'jenis',
+>>>>>>> 83d619ac (Continue dev on pampasan module)
        'status',
    ];

@@ -95,9 +99,12 @@ class Palsu extends Model
    {
        return $this->hasOne(Tebus::class, 'norujukan', 'norujukan');
    }
+<<<<<<< HEAD
    
    public function gadai(): HasOne
    {
        return $this->hasOne(Gadai::class, 'norujukan', 'norujukan');
    }
+=======
+>>>>>>> 83d619ac (Continue dev on pampasan module)
 }