diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 3ce3c31..fc0cce5 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -3403,29 +3403,33 @@ class GadaiController extends Controller
     }
 
     public function updateLelongTawarruq(Request $request){
-        $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
+        $cawangan_all = Cawangan::on('mysql7')->get();
 
-        // foreach($cawangan_all as $index=>$cawangan){
-            $gadai_all = Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['hargajualan','!=','bakihargajualan'],['hargajualan','!=',null]])->get();
+        foreach($cawangan_all as $index=>$cawangan){
+            $gadai_all = Gadai::on($cawangan['mysql'])->where('sttebus','')->where('hargajualan','!=','bakihargajualan')->get();
             foreach($gadai_all as $index=>$gadai){
-                $totalbayaran = $gadai['hargajualan'] - $gadai['bakihargajualan'];
+                $totalbayaran = round($gadai['hargajualan'] - $gadai['bakihargajualan'],1);
                 $upah6bln_raw = $gadai['bakiupah'];
 
                 $upah6bln_round = number_format($upah6bln_raw,2);
                 $upah6bln = substr($upah6bln_round, 0, -1);
-                $upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
+                //$upah6bln = floatval(preg_replace('/[^\d.]/', '', $upah6bln));
+		if(strpos($upah6bln,',')){                        
+           		 $upah6bln = str_replace(',','',$upah6bln);
+       		 }
+		
 
                 if($totalbayaran >= $upah6bln){
-                    Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
-                        'lelong_tawarruq'=>0
+                   $update_gadai= Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
+                        'lelong_tawarruq'=>'0'
                     ]);
                 }else{
-                    Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
-                        'lelong_tawarruq'=>1
+                    $update_gadai=Gadai::on($cawangan['mysql'])->where('norujukan',$gadai['norujukan'])->update([
+                        'lelong_tawarruq'=>'1'
                     ]);
                 }
             }
-        // }
+        }
         return response()->json('successful');
     }
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 83aa687..0471fda 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -669,7 +669,7 @@ class LelongController extends Controller
 
         $lelong = Lelong::on($cawangan['mysql'])   
                     ->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah')
-                    ->leftJoin('gadai', 'gadai.norujukan', '=', 'Lelong.norujukan')
+                    ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan')
                     // ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp')
                     ->where('batchno','=',$request->batchno)
                     ->orderBy('gadai.t_gadai','asc')
@@ -677,7 +677,7 @@ class LelongController extends Controller
 
         $batchlel = BatchLel::on($cawangan['mysql'])
                     ->where('batchno','=',$request->batchno)
-                    ->get()->toArray();
+                    ->first();
 
         $lelonglist = $lelong->get();
         
@@ -692,10 +692,10 @@ class LelongController extends Controller
                     ->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
                     ->where('kpbaru','=',$lel['nokp'])
                     ->orWhere('kplama','=',$lel['nokp'])
-                    ->get()->toArray();
+                    ->first();
             
             $poskod = Poskod::on('mysql7')
-                    ->where('poskod','=',$customer[0]['poskod'])
+                    ->where('poskod','=',$customer['poskod'])
                     ->first();
             
             $daerah = Daerah::on('mysql7')
@@ -706,7 +706,7 @@ class LelongController extends Controller
                 ->where('kodnegeri','=',$poskod['kodnegeri'])
                 ->first();
 
-            array_push($arraylelong,['poskod'=>$customer[0]['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer[0]['alamat1'],'alamat2' => $customer[0]['alamat2'],'masa' => $batchlel[0]['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer[0]['nama'], 'telefon1' => $customer[0]['telefon'], 'telefon2' => $customer[0]['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
+            array_push($arraylelong,['poskod'=>$customer['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer['alamat1'],'alamat2' => $customer['alamat2'],'masa' => $batchlel['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer['nama'], 'telefon1' => $customer['telefon'], 'telefon2' => $customer['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
         }
 
         return response()->json($arraylelong);