diff --git a/app/Console/Commands/kemaskiniLelong.php b/app/Console/Commands/kemaskiniLelong.php
index e23d8d74..b789b6dd 100644
--- a/app/Console/Commands/kemaskiniLelong.php
+++ b/app/Console/Commands/kemaskiniLelong.php
@@ -104,11 +104,11 @@ class kemaskiniLelong extends Command
                         }else if($gadai->tagbaru == '1'){
                             //kiraan keuntungan ujrah
                             $jeniskeuntungan = 'onepercent';
-                            $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
+                            // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
                             $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
-                            $keuntungan = $keuntungan1['pendapatan'];
                             $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                             $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                            $keuntungan = $rounded_ujrah + $rounded_onepercent;
 
                             $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
                             ->where('xlaku', 1)
@@ -164,11 +164,12 @@ class kemaskiniLelong extends Command
                     }elseif($gadai->tagbaru == '1'){
                          //kiraan keuntungan ujrah
                         $jeniskeuntungan = 'onepercent';
-                        $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
+                        // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
                         $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
-                        $keuntungan = $keuntungan1['pendapatan'];
                         $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                         $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                        $keuntungan = $rounded_ujrah + $rounded_onepercent;
+                        
 
                         $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
                             ->where('xlaku', 1)
@@ -220,7 +221,7 @@ class kemaskiniLelong extends Command
                 $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan SAG LAMA' ;
                 }
                 elseif($gadai->tagbaru == '1'){
-                $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan UJRAH' ;
+                $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan UJRAH '.$keuntungan ;
                 }
                 $loguser->save();
             }
diff --git a/app/Console/Commands/kemaskiniLelongUjrah.php b/app/Console/Commands/kemaskiniLelongUjrah.php
index 28ab751d..42ad107a 100644
--- a/app/Console/Commands/kemaskiniLelongUjrah.php
+++ b/app/Console/Commands/kemaskiniLelongUjrah.php
@@ -87,11 +87,11 @@ class kemaskiniLelongUjrah extends Command
                         }else{
                             //kiraan keuntungan ujrah
                             $jeniskeuntungan = 'onepercent';
-                            $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
+                            // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
                             $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
-                            $keuntungan = $keuntungan1['pendapatan'];
                             $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                             $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                            $keuntungan = $rounded_ujrah + $rounded_onepercent;
 
                         }
                         $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
@@ -131,11 +131,11 @@ class kemaskiniLelongUjrah extends Command
                     else{
                         //kiraan keuntungan ujrah
                         $jeniskeuntungan = 'onepercent';
-                        $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
+                        // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan.'/'.$jeniskeuntungan)->json();
                         $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$lelongbid->kodcaw.'/'.$lelongbid->norujukan)->json();
-                        $keuntungan = $keuntungan1['pendapatan'];
                         $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                         $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                        $keuntungan = $rounded_ujrah + $rounded_onepercent;
                         
                     }
                     $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 24fc9f7d..740f3d00 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3876,11 +3876,11 @@ class LelongController extends Controller
 
                                 //kiraan keuntungan ujrah
                                 $jeniskeuntungan = 'onepercent';
-                                $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
+                                // $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();
-                                $keuntungan = $keuntungan1['pendapatan'];
                                 $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                                 $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                                $keuntungan = $rounded_ujrah + $rounded_onepercent;
                                 
                             }
                         }
@@ -3911,11 +3911,11 @@ class LelongController extends Controller
                                 
                                 //kiraan keuntungan ujrah
                                 $jeniskeuntungan = 'onepercent';
-                                $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
+                                // $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();
-                                $keuntungan = $keuntungan1['pendapatan'];
                                 $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                                 $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                                $keuntungan = $rounded_ujrah + $rounded_onepercent;
                             }
                         }
                     }
@@ -3926,7 +3926,7 @@ class LelongController extends Controller
                     $totalbaki = $lelongbid_true->hargaasas - $lelongbid_true->pinjaman - $lelongbid_true->bakiupah - $cajlelongnew;
                     $customer['gadai'][$index2]['bakilelong'] = $totalbaki;
                     $customer['gadai'][$index2]['ktlhbyr'] = $ktlhbyr;
-                    $customer['gadai'][$index2]['keuntungan'] = bcdiv($keuntungan,1,1);
+                    $customer['gadai'][$index2]['keuntungan'] = bcdiv($keuntungan,1,2);
                 }
             }
             // dd($customer);
diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php
index f1d03924..233c5e95 100644
--- a/app/Http/Controllers/SimulasiUjrahController.php
+++ b/app/Http/Controllers/SimulasiUjrahController.php
@@ -530,11 +530,11 @@ class SimulasiUjrahController extends Controller
                                 }elseif($data['tagbaru'] == '1'){
                                         //kiraan keuntungan ujrah
                                         $jeniskeuntungan = 'onepercent';
-                                        $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
+                                        // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
                                         $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$data['kodcaw'].'/'.$data['norujukan'])->json();
-                                        $keuntungan = $keuntungan1['pendapatan'];
                                         $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                                         $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                                        $keuntungan = $rounded_ujrah + $rounded_onepercent;
                                 }
                                         //update dalam simulasibid
                                         $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
@@ -606,11 +606,11 @@ class SimulasiUjrahController extends Controller
                         if($data['tagbaru'] == '1'){
                                 //kiraan keuntungan ujrah
                                 $jeniskeuntungan = 'onepercent';
-                                $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
+                                // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
                                 $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$data['kodcaw'].'/'.$data['norujukan'])->json();
-                                $keuntungan = $keuntungan1['pendapatan'];
                                 $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                                 $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                                $keuntungan = $rounded_ujrah + $rounded_onepercent;
                             
                                 // dd($keuntungan);
                                 //update dalam simulasibid
@@ -1021,11 +1021,11 @@ 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();
+                    // $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();
-                    $keuntungan = $keuntungan1['pendapatan'];
                     $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                     $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                    $keuntungan = $rounded_ujrah + $rounded_onepercent;
                     
                 }
 
@@ -1255,11 +1255,11 @@ class SimulasiUjrahController extends Controller
                 
                 //kiraan keuntungan ujrah
                 $jeniskeuntungan = 'onepercent';
-                $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$details.'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json();
+                // $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahrebettawarruq/'.$details.'/'.$surats['norujukan'].'/'.$jeniskeuntungan)->json();
                 $ujrahonepercentrebet = Http::get(config('app.api_ujrah_url'). 'kiraupahUjrahOnePercentRebate/'.$details.'/'.$surats['norujukan'])->json();
-                $keuntungan = $keuntungan1['pendapatan'];
                 $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
                 $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
+                $keuntungan = $rounded_ujrah + $rounded_onepercent;
 
             // dd($surats['hargajualan']);
             $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];