Continue dev on pampasan module

app/Http/Controllers/BarangkesController.php

@@ -6,9 +6,9 @@ use App\Audit;
 use App\Polis;
 use App\Cawangan;
 use App\LookupAlasan;
+use App\Gadai;
 use App\Pampasan;
 use App\Palsu;
-use App\Gadai;
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;

app/Http/Controllers/PampasanController.php

@@ -70,6 +70,11 @@ class PampasanController extends Controller
         Palsu::on($cawangan['mysql'])
             ->where('norujukan', $norujukan)
             ->update(['status' => 1]);
+<<<<<<< HEAD
+=======
+
+        // dd($pampasan);
+>>>>>>> 83d619ac (Continue dev on pampasan module)
 
         return $this->successResponse('Status Pampasan berjaya dituntut.', $pampasan, 201);
     }

app/Palsu.php

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