diff --git a/app/Console/Commands/kemaskiniLelong.php b/app/Console/Commands/kemaskiniLelong.php
index 61269d17..91e966ff 100644
--- a/app/Console/Commands/kemaskiniLelong.php
+++ b/app/Console/Commands/kemaskiniLelong.php
@@ -49,7 +49,7 @@ class kemaskiniLelong extends Command
         $currentdate = $currentdate->toDateTimeString();
         $data = [];
 
-        $lelongbids = LelongBid::where('status_jual',0)->where('tagujrah','0')->get();
+        $lelongbids = LelongBid::where('status_jual',0)->get();
 
         foreach($lelongbids as $index=>$lelongbid){
             $gadai = Gadai::on($lelongbid->kodcaw)->where('norujukan',$lelongbid->norujukan)->first();
@@ -76,29 +76,51 @@ class kemaskiniLelong extends Command
                                 ])
                                 ->json();
                     }else{
-                        $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('keuntungan_rebet');
-                        $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('bayaran_keuntungan');
-                        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-                        if($gadai->tempohbayar == $gadai->tempoh ){
-                            $keuntungan = 0.00;
-                        }else{
-                            $jbg = $gadai->tempoh - $gadai->tempohbayar;
-                            $jbg2 = 12 - $gadai->tempohbayar;
-                            if($gadai->tempoh <= '12.00'){
-                                $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                        if($gadai->tagbaru == '0'){
+                            $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('keuntungan_rebet');
+                            $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('bayaran_keuntungan');
+                            $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                            if($gadai->tempohbayar == $gadai->tempoh ){
+                                $keuntungan = 0.00;
                             }else{
-                                $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
-                            }
+                                $jbg = $gadai->tempoh - $gadai->tempohbayar;
+                                $jbg2 = 12 - $gadai->tempohbayar;
+                                if($gadai->tempoh <= '12.00'){
+                                    $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                                }else{
+                                    $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                                }
 
-                        }
-                        $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
+                            }
+                            $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
+                                ->where('xlaku', 1)
+                                ->first();
+                            if (!$checkdataxlaku) {
+                                $lelongbid->jbg = $gadai->tempoh;
+                                $lelongbid->pinjaman = $gadai->bakipjm;
+                                $lelongbid->bakiupah = $keuntungan;
+                                $lelongbid->save();
+                            }
+                        }else if($gadai->tagbaru == '1'){
+                            $jeniskeuntungan = 'onepercent';
+                            $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'];
+
+                            $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
                             ->where('xlaku', 1)
                             ->first();
-                        if (!$checkdataxlaku) {
-                            $lelongbid->jbg = $gadai->tempoh;
-                            $lelongbid->pinjaman = $gadai->bakipjm;
-                            $lelongbid->bakiupah = $keuntungan;
-                            $lelongbid->save();
+                            if (!$checkdataxlaku) {
+                                $lelongbid->jbg = $gadai->tempoh;
+                                $lelongbid->pinjaman = $gadai->bakipjm;
+                                $lelongbid->bakiupah = $keuntungan;
+                                $lelongbid->ujrah = $rounded_ujrah;
+                                $lelongbid->onepercent = $rounded_onepercent;
+                                $lelongbid->save();
+                            }
+
                         }
                     }
                 }
@@ -110,32 +132,53 @@ class kemaskiniLelong extends Command
                     $keluar_lelong = true;
                     $sebab_keluar = 'L';
                 }else{
-                    $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('keuntungan_rebet');
-                    $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('bayaran_keuntungan');
-                    $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-                    if($gadai->tempohbayar == 12){
-                        $keuntungan = 0.00;
-                    }
-                    elseif($gadai->tempohbayar == $gadai->tempoh ){
-                        $keuntungan = 0.00;
-                    }
-                    else{
-                        $jbg = $gadai->tempoh - $gadai->tempohbayar;
-                        $jbg2 = 12 - $gadai->tempohbayar;
-                        if($gadai->tempoh <= '12.00'){
-                            $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
-                        }else{
-                            $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                    if($gadai->tagbaru == '0'){
+                        $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('keuntungan_rebet');
+                        $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('bayaran_keuntungan');
+                        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                        if($gadai->tempohbayar == 12){
+                            $keuntungan = 0.00;
+                        }
+                        elseif($gadai->tempohbayar == $gadai->tempoh ){
+                            $keuntungan = 0.00;
+                        }
+                        else{
+                            $jbg = $gadai->tempoh - $gadai->tempohbayar;
+                            $jbg2 = 12 - $gadai->tempohbayar;
+                            if($gadai->tempoh <= '12.00'){
+                                $keuntungan = bcdiv(($jbg)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                            }else{
+                                $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan;
+                            }
+                        }
+                        $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
+                            ->where('xlaku', 1)
+                            ->first();
+                        if (!$checkdataxlaku) {
+                            $lelongbid->jbg = $gadai->tempoh;
+                            $lelongbid->pinjaman = $gadai->bakipjm;
+                            $lelongbid->bakiupah = $keuntungan;
+                            $lelongbid->save();
+                        }
+                    }elseif($gadai->tagbaru == '1'){
+                        $jeniskeuntungan = 'onepercent';
+                        $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'];
+
+                        $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
+                            ->where('xlaku', 1)
+                            ->first();
+                        if (!$checkdataxlaku) {
+                            $lelongbid->jbg = $gadai->tempoh;
+                            $lelongbid->pinjaman = $gadai->bakipjm;
+                            $lelongbid->bakiupah = $keuntungan;
+                            $lelongbid->ujrah = $rounded_ujrah;
+                            $lelongbid->onepercent = $rounded_onepercent;
+                            $lelongbid->save();
                         }
-                    }
-                    $checkdataxlaku = LelongBid::where('norujukan', $lelongbid->norujukan)
-                        ->where('xlaku', 1)
-                        ->first();
-                    if (!$checkdataxlaku) {
-                        $lelongbid->jbg = $gadai->tempoh;
-                        $lelongbid->pinjaman = $gadai->bakipjm;
-                        $lelongbid->bakiupah = $keuntungan;
-                        $lelongbid->save();
                     }
                 }
             }
@@ -171,7 +214,12 @@ class kemaskiniLelong extends Command
                 $loguser->username = 'System';
                 $loguser->nama_user = 'System';
                 $loguser->norujukan = $gadai->norujukan;
-                $loguser->nota = $lelongbid->lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                if($gadai->tagbaru == '0'){
+                $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->save();
             }
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 81b0c32f..8e4ae65d 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3907,7 +3907,7 @@ class LelongController extends Controller
                                 
                                 //kiraan keuntungan ujrah
                                 $jeniskeuntungan = 'onepercent';
-                                $keuntungan1 = Http::get(config('app.api_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
+                                $keuntungan1 = Http::get(config('app.api_ujrah_url'). 'upahtawarruq/'.$cawanganDetail->caw_code.'/'.$datagadai->norujukan.'/'.$jeniskeuntungan)->json();
                                 $keuntungan = round(($keuntungan1['pendapatan']*100)/5,0)*5/100;  
                                 // dd($keuntungan);                          
                             }
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 261d327e..62fe8984 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -1707,6 +1707,7 @@ class SimulasiController extends Controller
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
+                        ->where('tagbaru','=',0)
                         ->where('lelong_tawarruq','=',1)
                         ->whereNotNull('upah12');
 
@@ -1742,6 +1743,7 @@ class SimulasiController extends Controller
                         ->where('tagpalsu','=',0)
                         ->where('tagpalsu2','=',0)
                         ->where('taglel','=',0)
+                        ->where('tagbaru','=',0)
                         // ->where('lelong_tawarruq','=',1)
                         ->whereNotNull('upah12');
 
@@ -1811,6 +1813,7 @@ class SimulasiController extends Controller
                                 ->where('taglel', '=', 0)
                                 ->where('tagpalsu', '=', 0)
                                 ->where('tagpalsu2', '=', 0)
+                                ->where('tagbaru', '=', 0)
                                 ->whereNotNull('upah12')
                                 ->get();
 
@@ -1820,6 +1823,7 @@ class SimulasiController extends Controller
                                 ->where('taglel', '=', 0)
                                 ->where('tagpalsu', '=', 0)
                                 ->where('tagpalsu2', '=', 0)
+                                ->where('tagbaru', '=', 0)
                                 ->whereNotNull('upah12')
                                 ->orderBy('t_gadai')
                                 ->select('t_gadai')
@@ -1832,6 +1836,7 @@ class SimulasiController extends Controller
                             ->where('taglel', '=', 0)
                             ->where('tagpalsu', '=', 0)
                             ->where('tagpalsu2', '=', 0)
+                            ->where('tagbaru', '=', 0)
                             ->whereNotNull('upah12')
                             ->get();
 
@@ -1841,6 +1846,7 @@ class SimulasiController extends Controller
                             ->where('taglel', '=', 0)
                             ->where('tagpalsu', '=', 0)
                             ->where('tagpalsu2', '=', 0)
+                            ->where('tagbaru', '=', 0)
                             ->whereNotNull('upah12')
                             ->orderBy('t_gadai')
                             ->select('t_gadai')
@@ -2034,7 +2040,7 @@ class SimulasiController extends Controller
                             $loguser->username = $user->username;
                             $loguser->nama_user = $user->name;
                             $loguser->norujukan = $data['norujukan'];
-                            $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                            $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan SAG LAMA' ;
                             $loguser->save();
                         }
                     
@@ -2110,7 +2116,7 @@ class SimulasiController extends Controller
                         $loguser->username = $user->username;
                         $loguser->nama_user = $user->name;
                         $loguser->norujukan = $data['norujukan'];
-                        $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                        $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan SAG LAMA' ;
                         $loguser->save();
                     }
                     $date = Carbon::now()->toDateTimeString();
diff --git a/app/Http/Controllers/SimulasiUjrahController.php b/app/Http/Controllers/SimulasiUjrahController.php
index f1d3eeee..10949a8f 100644
--- a/app/Http/Controllers/SimulasiUjrahController.php
+++ b/app/Http/Controllers/SimulasiUjrahController.php
@@ -490,39 +490,73 @@ class SimulasiUjrahController extends Controller
                                 $rounded_onepercent = 0.00;
                             }
                             else{
-                                 //kiraan keuntungan ujrah
-                                $jeniskeuntungan = 'onepercent';
-                                $keuntungan1 = Http::get(config('app.api_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
-                                $ujrahonepercentrebet = Http::get(config('app.api_url'). 'kiraupahUjrahOnePercentRebate/'.$data['kodcaw'].'/'.$data['norujukan'])->json();
-                                // dd($ujrahonepercentrebet);
-                                $keuntungan = $keuntungan1['pendapatan'];
-                                $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
-                                $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
-                                // $keuntungan = round(($keuntungan1*100)/5,0)*5/100;
-                                // $rounded_ujrah = round(($ujrahonepercentrebet['ujrah']*100)/5,0)*5/100;
-                                // $rounded_onepercent = round(($ujrahonepercentrebet['onepercent']*100)/5,0)*5/100;
-                                }
-                                //update dalam simulasibid
-                                $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
-                                                ->where('simulasi_id', $simulasi_id)
-                                                ->first();
-                                $updatetempoh->jbg = $data['tempoh'];
-                                $updatetempoh->pinjaman = $data['bakipjm'];
-                                // $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
-                                $updatetempoh->bakiupah = $keuntungan;
-                                $updatetempoh->ujrah = $rounded_ujrah;
-                                $updatetempoh->onepercent = $rounded_onepercent;
-                                $updatetempoh->update();
+                                if($data['tagbaru'] == '0'){
+                                    //kemaskini keuntungan
+                                        $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
+                                        $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
+                                        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                                        // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                        if($data['tempohbayar'] == $data['tempoh'] ){
+                                            $keuntungan = 0.00;
+                                        }else{
+                                            $jbg = $data['tempoh']-$data['tempohbayar'];
+                                            $jbg2 = 12- $data['tempohbayar'];
+                                            if($data['tempoh'] <= '12.00'){
+                                                $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                            }else{
+                                                $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                            }
+                                        }
+                                        // dd($keuntungan);
+                                        //update dalam simulasibid
+                                        $updatetempoh = LelongBid::where('norujukan', $data['norujukan'])
+                                                        ->where('lelong_id', $lelong_id)
+                                                        ->first();
+                                        $updatetempoh->jbg = $data['tempoh'];
+                                        $updatetempoh->pinjaman = $data['bakipjm'];
+                                        $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                                        $updatetempoh->update();
 
-                            //insert loguser
-                            $loguser = new LogUser;
-                            $loguser->user_id = $user->id;
-                            $loguser->date = $currentdate;
-                            $loguser->username = $user->username;
-                            $loguser->nama_user = $user->name;
-                            $loguser->norujukan = $data['norujukan'];
-                            $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan '.$rounded_ujrah ;
-                            $loguser->save();
+                                        //insert loguser
+                                        $loguser = new LogUser;
+                                        $loguser->user_id = $user->id;
+                                        $loguser->date = $currentdate;
+                                        $loguser->username = $user->username;
+                                        $loguser->nama_user = $user->name;
+                                        $loguser->norujukan = $data['norujukan'];
+                                        $loguser->nota = $lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                                        $loguser->save();
+                                }elseif($data['tagbaru'] == '1'){
+                                        //kiraan keuntungan ujrah
+                                        $jeniskeuntungan = 'onepercent';
+                                        $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'];
+                                }
+                                        //update dalam simulasibid
+                                        $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
+                                                        ->where('simulasi_id', $simulasi_id)
+                                                        ->first();
+                                        $updatetempoh->jbg = $data['tempoh'];
+                                        $updatetempoh->pinjaman = $data['bakipjm'];
+                                        // $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                                        $updatetempoh->bakiupah = $keuntungan;
+                                        $updatetempoh->ujrah = $rounded_ujrah;
+                                        $updatetempoh->onepercent = $rounded_onepercent;
+                                        $updatetempoh->update();
+
+                                        //insert loguser
+                                        $loguser = new LogUser;
+                                        $loguser->user_id = $user->id;
+                                        $loguser->date = $currentdate;
+                                        $loguser->username = $user->username;
+                                        $loguser->nama_user = $user->name;
+                                        $loguser->norujukan = $data['norujukan'];
+                                        $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan '.$rounded_ujrah ;
+                                        $loguser->save();
+                                }
                         }
                     
                         $date = Carbon::now()->toDateTimeString();
@@ -568,54 +602,74 @@ class SimulasiUjrahController extends Controller
                         $loguser->save();
                     }
                     else{
-                        //kemaskini keuntungan
-                        $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
-                        $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
-                        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-                        
-                        if($data['tempohbayar'] == 12){
-                            $keuntungan = 0.00;
-                            $rounded_ujrah = 0.00;
-                            $rounded_onepercent = 0.00;
-                        }
-                        elseif($data['tempoh'] == $data['tempohbayar']){
-                            $keuntungan = 0.00;
-                            $rounded_ujrah = 0.00;
-                            $rounded_onepercent = 0.00;
-                        }else{
-                             //kiraan keuntungan ujrah
-                            $jeniskeuntungan = 'onepercent';
-                            $keuntungan1 = Http::get(config('app.api_url'). 'upahrebettawarruq/'.$data['kodcaw'].'/'.$data['norujukan'].'/'.$jeniskeuntungan)->json();
-                            $ujrahonepercentrebet = Http::get(config('app.api_url'). 'kiraupahUjrahOnePercentRebate/'.$data['kodcaw'].'/'.$data['norujukan'])->json();
-                            $keuntungan = $keuntungan1['pendapatan'];
-                            $rounded_ujrah = $ujrahonepercentrebet['ujrah'];
-                            $rounded_onepercent = $ujrahonepercentrebet['onepercent'];
-                            // $keuntungan = round(($keuntungan1*100)/5,0)*5/100;
-                            // $rounded_ujrah = round(($ujrahonepercentrebet['ujrah']*100)/5,0)*5/100;
-                            // $rounded_onepercent = round(($ujrahonepercentrebet['onepercent']*100)/5,0)*5/100;
-                        }
-                        // dd($keuntungan);
-                        //update dalam simulasibid
-                        $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
-                                        ->where('simulasi_id', $simulasi_id)
-                                        ->first();
-                        $updatetempoh->jbg = $data['tempoh'];
-                        $updatetempoh->pinjaman = $data['bakipjm'];
-                        // $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
-                        $updatetempoh->bakiupah = $keuntungan;
-                        $updatetempoh->ujrah = $rounded_ujrah;
-                        $updatetempoh->onepercent = $rounded_onepercent;
-                        $updatetempoh->update();
+                        if($data['tagbaru'] == '1'){
+                                //kiraan keuntungan ujrah
+                                $jeniskeuntungan = 'onepercent';
+                                $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'];
+                            
+                                // dd($keuntungan);
+                                //update dalam simulasibid
+                                $updatetempoh = SimulasiBid::where('norujukan', $data['norujukan'])
+                                                ->where('simulasi_id', $simulasi_id)
+                                                ->first();
+                                $updatetempoh->jbg = $data['tempoh'];
+                                $updatetempoh->pinjaman = $data['bakipjm'];
+                                // $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                                $updatetempoh->bakiupah = $keuntungan;
+                                $updatetempoh->ujrah = $rounded_ujrah;
+                                $updatetempoh->onepercent = $rounded_onepercent;
+                                $updatetempoh->update();
 
-                        //insert loguser
-                        $loguser = new LogUser;
-                        $loguser->user_id = $user->id;
-                        $loguser->date = $currentdate;
-                        $loguser->username = $user->username;
-                        $loguser->nama_user = $user->name;
-                        $loguser->norujukan = $data['norujukan'];
-                        $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
-                        $loguser->save();
+                                //insert loguser
+                                $loguser = new LogUser;
+                                $loguser->user_id = $user->id;
+                                $loguser->date = $currentdate;
+                                $loguser->username = $user->username;
+                                $loguser->nama_user = $user->name;
+                                $loguser->norujukan = $data['norujukan'];
+                                $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan UJRAH' ;
+                                $loguser->save();
+                        }elseif($data['tagbaru'] == '0'){
+                                //kemaskini keuntungan
+                                $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('keuntungan_rebet');
+                                $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$data['norujukan'])->sum('bayaran_keuntungan');
+                                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                                // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                if($data['tempohbayar'] == $data['tempoh'] ){
+                                    $keuntungan = 0.00;
+                                }else{
+                                    $jbg = $data['tempoh']-$data['tempohbayar'];
+                                    $jbg2 = 12- $data['tempohbayar'];
+                                    if($data['tempoh'] <= '12.00'){
+                                        $keuntungan = bcdiv(($jbg)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                    }else{
+                                        $keuntungan = bcdiv(($jbg2)*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                                    }
+                                }
+                                // dd($keuntungan);
+                                //update dalam simulasibid
+                                $updatetempoh = LelongBid::where('norujukan', $data['norujukan'])
+                                                ->where('lelong_id', $lelong_id)
+                                                ->first();
+                                $updatetempoh->jbg = $data['tempoh'];
+                                $updatetempoh->pinjaman = $data['bakipjm'];
+                                $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                                $updatetempoh->update();
+
+                                //insert loguser
+                                $loguser = new LogUser;
+                                $loguser->user_id = $user->id;
+                                $loguser->date = $currentdate;
+                                $loguser->username = $user->username;
+                                $loguser->nama_user = $user->name;
+                                $loguser->norujukan = $data['norujukan'];
+                                $loguser->nota = $lelong_id.' Kemaskini Tempoh/Bakipjm/Keuntungan SAG LAMA' ;
+                                $loguser->save();
+                        }
                     }
                     $date = Carbon::now()->toDateTimeString();
                     $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
diff --git a/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php b/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php
index d25598d1..938ef10f 100644
--- a/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php
+++ b/database/migrations/2024_07_08_120241_add_tag_ujrah_in_lelongbidxlaku.php
@@ -15,8 +15,8 @@ class AddTagUjrahInLelongbidxlaku extends Migration
     {
         Schema::table('lelongbid_xlaku', function (Blueprint $table) {
             $table->integer('tagujrah')->default(0);
-            $table->decimal('ujrah', 5, 2);
-            $table->decimal('onepercent', 5, 2);
+            $table->decimal('ujrah', 7, 2);
+            $table->decimal('onepercent', 7, 2);
         });
     }