Merge branch 'amirah' into 'main'

update error and join customer table

See merge request online-sistem1/lelong!76

app/Http/Controllers/NotisController.php

@@ -106,11 +106,7 @@ class NotisController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user->kodcaw)
         ->where('cawangan_lelong.lelong_id', $lelong_id)
-        ->get();
-
-
-  
-        $lelong = Lelong::where('id', $lelongid)->get();
+        ->get(); 
 
   
 
@@ -131,7 +127,9 @@ class NotisController extends Controller
         $lelong_id = $request->lelong_id;
 
         $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->join('customer','gadai.nokp','=','customer.kpbaru')
+        ->join('customer', function ($join) {
+        $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
+        })       
         ->where('gadai.kodcaw','=',$user->kodcaw)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->get()->toArray();      

app/Http/Controllers/TamatKontController.php

@@ -100,7 +100,6 @@ class TamatKontController extends Controller
                                             't_lelong',
                                             'user',
                                             't_gadais',
-                                            't_gadaisehingga',
                                             't_anggaran',
                                             'bil_lelongcaw'
                                             ));