diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 62fe8984..518f05bc 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -2274,17 +2274,12 @@ class SimulasiController extends Controller
             // ->get()->toArray();
             // dump($cawsim->simulasi_id);
 
-            $databid = SimulasiBid::   join('cawangan_simulasi', function ($join) {
-                $join->on('cawangan_simulasi.caw_id', '=', 'simulasibid.caw_id')
-                     ->on('cawangan_simulasi.simulasi_id', '=', 'simulasibid.simulasi_id');
-            })
-
+            $databid = SimulasiBid::join('cawangan_simulasi','cawangan_simulasi.caw_id','=','simulasibid.caw_id')
             ->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
-            'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah','cawangan_simulasi.kali','norujukan')
-            ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
+            'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','simulasibid.bakiupah')
             ->where('cawangan_simulasi.caw_id','=', $cawsim->caw_id)
-            ->where('cawangan_simulasi.kali','=',$kali)
-            ->get()->toArray();
+            ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
+            ->get();
 
             $t_simulasi = Simulasi::join('cawangan_simulasi','cawangan_simulasi.simulasi_id','=','simulasi.id')
             ->where('cawangan_simulasi.simulasi_id','=', $cawsim->simulasi_id)
@@ -2300,6 +2295,7 @@ class SimulasiController extends Controller
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
+            $id = $cawsim->simulasi_id;
 
             // $keuntungan = 0;
             // $total_upahkeuntungan = 0;
@@ -2320,7 +2316,12 @@ class SimulasiController extends Controller
                 $pinjaman =$pinjaman + $bid['pinjaman'];
                 $bakiupah = $bakiupah + $bid['bakiupah'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
-                $cajlelong = $cajlelong + $bid['cajlelong'];
+                // $cajlelong = $cajlelong + $bid['cajlelong'];
+
+                $lelongsim = Simulasi::where('id',$id)->get();
+                $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
+                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
 
 
                 // $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
@@ -2331,13 +2332,13 @@ class SimulasiController extends Controller
 
 
 
-                if($bid['baki'] > 0)
+                if($totalbaki > 0)
                 {
-                    $bakilelong = $bakilelong + $bid['baki'];
+                    $bakilelong = $bakilelong + $totalbaki;  
                 }
                 else
                 {
-                    $rugilelong = $rugilelong - $bid['baki'];
+                    $rugilelong = $rugilelong - $totalbaki;
                 }
 
 
diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php
index 233c5e95..757d7469 100644
--- a/app/Http/Controllers/SimulasiUjrahController.php
+++ b/app/Http/Controllers/SimulasiUjrahController.php
@@ -1022,7 +1022,7 @@ class SimulasiUjrahController extends Controller
                     //kiraan keuntungan ujrah
                     $jeniskeuntungan = 'onepercent';
                     // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
-                    $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan)->json();
+                    $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$cawanganDetail->caw_code.'/'.$listing['norujukan'])->json();
                     $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                     $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
                     $keuntungan = $rounded_ujrah + $rounded_onepercent;