diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 010b5f2e..88d56a33 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -4958,6 +4958,7 @@ class LelongController extends Controller
         $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
         ->where('status_jual','=',0)
+        ->orderBy('norujukan', 'ASC')
         ->select(
             'lelongbid.t_lelong',
             'lelongbid.kodcaw',
@@ -6187,6 +6188,236 @@ class LelongController extends Controller
         
     }
 
+    public function kemaskinidatapc($lelong_id)
+    {
+        $user = Auth::user();
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+        $data = [];
+        
+        $getcaw = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('lelongbid','cawangan_lelong.caw_id','=','lelongbid.caw_id')
+        ->where('lelong.id', $lelong_id)
+        ->where('lelongbid.kodcaw', $user->kodcaw)
+        ->groupBy('lelongbid.caw_id')
+        ->select('lelongbid.caw_id')
+        ->get();
+        // dd($getcaw);
+        foreach($getcaw as $index=>$caw)
+        {
+            $cawid = $caw['caw_id'];
+            $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+            ->where('lelong_id','=',$lelong_id)
+            ->where('caw_id','=',$caw['caw_id'])
+            ->select('lelongbid.norujukan','lelongbid.fasa','lelongbid.kodcaw');
+    
+            $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+            $datalelong = $marhun->get();
+            // dd($datalelong[$index]['fasa']);
+            $kodcaw = $datalelong[$index]['kodcaw'];
+            
+            $senaraisag = Gadai::on($datalelong[$index]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->get();
+            // dd($senaraisag);
+            foreach($senaraisag as $data)
+            {
+                
+                $marhunitemfasa = LelongBid::where('lelong_id','=',$lelong_id)
+                ->where('kodcaw','=',$kodcaw)
+                ->where('norujukan','=',$data['norujukan'])
+                ->select('lelongbid.norujukan','lelongbid.fasa')
+                ->first();
+                // dd($marhunitemfasa->fasa);
+                if($marhunitemfasa->fasa == 1){
+                //insert lelong_tebus
+                if($data['sttebus'] == "T")
+                {
+                    $lelongtebus = new LelongTebus;
+                    $lelongtebus->tarikh = $currentdate;
+                    $lelongtebus->kodcaw = $data['kodcaw'];
+                    $lelongtebus->teller = $user->name;
+                    $lelongtebus->norujukan = $data['norujukan'];
+                    $lelongtebus->batch_no = $lelong_id;
+                    $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                    $lelongtebus->pinjaman = $data['pinjaman'];
+                    $lelongtebus->upah = $data['bakiupah'];
+                    $lelongtebus->jbg = $data['jbg'];
+                    $lelongtebus->jenis_tebus = 'T';
+                    $lelongtebus->save();
+
+                    // dd($data['norujukan']);
+                    $updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
+                    $updatelelong->delete();
+                    //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 TEBUS '.$lelong_id;
+                    $loguser->save();
+
+
+                }
+                else if($data['sttebus'] == ""){
+                    $ktlhbyr = $data['hargajualan']-$data['bakihargajualan'];
+                    if($ktlhbyr >= $data['bakiupah'])
+                    {
+                        $lelongtebus = new LelongTebus;
+                        $lelongtebus->tarikh = $currentdate;
+                        $lelongtebus->kodcaw = $data['kodcaw'];
+                        $lelongtebus->teller = $user->name;
+                        $lelongtebus->norujukan = $data['norujukan'];
+                        $lelongtebus->batch_no = $lelong_id;
+                        $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                        $lelongtebus->pinjaman = $data['pinjaman'];
+                        $lelongtebus->upah = $data['bakiupah'];
+                        $lelongtebus->jbg = $data['jbg'];
+                        $lelongtebus->jenis_tebus = 'A';
+                        $lelongtebus->save();
+    
+                        // dd($data['norujukan']);
+                        $updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
+                        $updatelelong->delete();
+                        //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 = ' KELUAR LELONG '.$lelong_id;
+                        $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;
+                        // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                        $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' ;
+                        $loguser->save();
+                    }
+                    $date = Carbon::now()->toDateTimeString();
+                    $lelong = Lelong::where('id','=',$lelong_id)->first();
+                    $lelong->masakemaskini_data = $date;
+                    $lelong->save();
+
+                }
+            }else if($marhunitemfasa->fasa == 2){
+                // dd($datasimulasi[$index]['fasa']);
+                if($data['sttebus'] == "T")
+                {
+                    $lelongtebus = new LelongTebus;
+                    $lelongtebus->tarikh = $currentdate;
+                    $lelongtebus->kodcaw = $data['kodcaw'];
+                    $lelongtebus->teller = $user->name;
+                    $lelongtebus->norujukan = $data['norujukan'];
+                    $lelongtebus->batch_no = $lelong_id;
+                    $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                    $lelongtebus->pinjaman = $data['pinjaman'];
+                    $lelongtebus->upah = $data['bakiupah'];
+                    $lelongtebus->jbg = $data['jbg'];
+                    $lelongtebus->jenis_tebus = 'T';
+                    $lelongtebus->save();
+                    
+                    $updategadai = Http::withOptions(['verify' => config('app.api_verify')])
+                    ->post(config('app.api_url').'taglel/revert',[
+                        'kodcaw'=>$data['kodcaw'],
+                        'norujukan'=>$data['norujukan']
+                        ])
+                        ->json();
+                        
+                        // dd($data['norujukan']);
+                        $updatelelong = LelongBid::where('norujukan','=',$data['norujukan'])->first();
+                        $updatelelong->delete();
+                        //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 TEBUS '.$lelong_id;
+                        $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;
+                        // $keuntungan = bcdiv(($data['tempoh']-$data['tempohbayar'])*$data['kadarupah']/100*$data['bakipjm'],1,1)-$beza_keuntungan;
+                        $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' ;
+                        $loguser->save();
+                    }
+                    $date = Carbon::now()->toDateTimeString();
+                    $lelong = Lelong::where('id','=',$lelong_id)->first();
+                    $lelong->masakemaskini_data = $date;
+                    $lelong->save();
+                }
+                
+                
+            }
+            
+        }
+    
+   
+        // dd($datalelong[$index]['fasa']);
+            return redirect()->route('jananotis.senarailelongpc')
+            ->with('success','Kemaskini Berjaya');
+    }
+
 
     
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index d276938f..ce07e9ef 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -833,6 +833,7 @@ class ReportController extends Controller
         $total_cazlelong = 0;
         $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
+        ->orderBy('norujukan', 'ASC')
         ->select(
             'lelongbid.t_lelong',
             'lelongbid.kodcaw',
diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php
index 7f7f5d11..ef9d9092 100644
--- a/resources/views/lelong/senarailelongpc.blade.php
+++ b/resources/views/lelong/senarailelongpc.blade.php
@@ -88,6 +88,7 @@
                             @hasrole('pengurus-cawangan')
                             <div class="row justify-content-center">
                                 @if($data['laporan']['sts_lelong'] == 0)
+                                <a class="btn m-1 btn-warning confirmrefresh" href="{{ route('jananotis.kemaskinidatapc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Lelong"><i class="fas fa-sync-alt"></i></a>
                                  {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
                                 <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                 @elseif($data['laporan']['sts_lelong'] == 3)
diff --git a/resources/views/lelong/showlelongpc.blade.php b/resources/views/lelong/showlelongpc.blade.php
index 63c4a568..061eac0a 100644
--- a/resources/views/lelong/showlelongpc.blade.php
+++ b/resources/views/lelong/showlelongpc.blade.php
@@ -199,7 +199,7 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td style="white-space: nowrap;"><a href=" {{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
diff --git a/routes/web.php b/routes/web.php
index f0a74a00..1d4cc013 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -448,6 +448,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
     Route::get('/listpengesahanakaun/{lelong_id}/{kodcaw}',['as'=>'account.listpengesahanakaun','uses'=>'AccountController@listpengesahanakaun']);
     Route::get('/statuspembayaran',['as'=>'account.statuspembayaran','uses'=>'PembidaController@statuspembayaran']);
     Route::get('/statuspembayaranbypembida',['as'=>'account.statuspembayaranbypembida','uses'=>'PembidaController@statuspembayaranbypembida']);
+    // Route::get('/sahsagcdm/{lelong_id}/{user_id}/{caw_code}', ['as'=>'account.sahsagcdm','uses'=>'AccountController@sahsagcdm']);
+    // Route::get('/showphotoresit',['as'=>'account.showphotoresit','uses'=>'AccountController@showPhotoResit']);
 });
 
 // Pengurus Cawangan 
@@ -486,6 +488,7 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
     Route::get('/showlelongpcdone/{id}',['as'=>'jananotis.showlelongpcdone','uses'=>'LelongController@showlelongpcdone']); 
     Route::get('/senaraimarhunpcdone/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhunpcdone','uses'=>'LelongController@senaraimarhunpcdone']);
     Route::post('/exportlelongpcdone',['as'=>'jananotis.exportlelongpcdone','uses'=>'LelongController@exportlelongpcdone']);
+    Route::get('/kemaskinidatapc/{lelong_id}',['as'=>'jananotis.kemaskinidatapc','uses'=>'LelongController@kemaskinidatapc']);
 
 });