diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index 76431cac..6e9cc4f1 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -61,42 +61,52 @@ class TangguhLelongController extends Controller
         
         if($request->nokp == null)
         {
-            return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Sila Masukkan No Kad Pengenalan');
+            return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Sila Masukkan No Kad Pengenalan');
         }
         else if($request->nokp != null)
         {
             $lelong = Lelong::where('id', $request->lelong_id)->first();
-
-            $getic = Customer::join('gadai', 'customer.nopelanggan', '=', 'gadai.nopelanggan')
-            ->where('customer.kpbaru', $request->nokp)
-            ->where('gadai.tempoh', $lelong->jbg)
+            
+            $getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp')
+            ->where('customer.kpbaru', '=', $request->nokp)
+            ->where('gadai.tempoh', '=', $lelong->jbg)
             ->get();
-
+            
             foreach($getic as $index1=>$ic)
             {
                 $getnorujukan = LelongBid::where('norujukan', $ic->norujukan)
                 ->where('jbg', $ic->tempoh)
                 ->get();
-
+                
                 foreach($getnorujukan as $norujukan)
                 {
                     $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id)
                     ->where('lelongbid_id', $norujukan->lelongbid_id)
                     ->where('norujukan', $norujukan->norujukan)
-                    ->get()->toArray();
-                    
+                    ->first();
+
+                    $adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan')
+                    ->where('pengesahan.norujukan', $norujukan->norujukan)
+                    ->where('pengesahan.status_ubah', 6)
+                    ->where('pengesahan.lelong_id', $request->lelong_id)
+                    ->get();
+
                     if($pengesahan)
                     {
-                        return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Telah Dibuat');
+                        return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('failed','Pengesahan Tangguh Lelong Telah Dibuat');
+                    }
+                    else
+                    {
+                        //
                     }
                 }
-
+                
                 $getic[$index1]['user_details'] = $getnorujukan;
-                // dd($getic[$index1]['user_details']);
+                $getic[$index1]['sdhadapengesahan'] = $adapengesahan;
             }
             $lelong_id = $request->lelong_id;
     
-            return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id' ));
+            return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id'));
 
         }
 
@@ -165,6 +175,16 @@ class TangguhLelongController extends Controller
             $pengesahan->status = 2;
             $pengesahan->status_ubah = 6;
             $pengesahan->save();
+
+            $tangguhlelong = new TangguhLelong();
+            $tangguhlelong->lelong_id = $request->lelong_id;
+            $tangguhlelong->lelongbid_id = $bidmarhun;
+            $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
+            $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
+            $tangguhlelong->ditangguh_oleh = $user->id;
+            $tangguhlelong->ditangguh_pada = $currentdate;
+            $tangguhlelong->nota = $request->remark;
+            $tangguhlelong->save();
     
         }
         return redirect()->route('tangguhlelong.carian', $request->lelong_id)->with('success','Pengesahan Tangguh Lelong Berjaya');
@@ -204,9 +224,11 @@ class TangguhLelongController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
 
-        $pengesahan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
-        ->whereNull('disahkan_oleh')
-        ->whereNull('disahkan_pada')
+        $pengesahan = Pengesahan::join('tangguhlelong', 'pengesahan.norujukan', '=', 'tangguhlelong.norujukan')
+        ->where('pengesahan.lelong_id', $lelong_id)
+        ->whereNull('pengesahan.disahkan_oleh')
+        ->whereNull('pengesahan.disahkan_pada')
+        ->whereNull('tangguhlelong.tarikhtangguh')
         ->get();
 
         foreach($pengesahan as $index1=>$sah)
@@ -215,9 +237,10 @@ class TangguhLelongController extends Controller
             ->where('norujukan', $sah->norujukan)
             ->where('kodcaw', $caw_code)
             ->get();
-            // dd($lelongbid[0]['jbg']);
 
             $pengesahan[$index1]['bid_details'] = $lelongbid;
+            $pengesahan[$index1]['nota'] = $sah->nota;
+
         }
 
         return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code'));
@@ -285,15 +308,11 @@ class TangguhLelongController extends Controller
             $pengesahan->disahkan_pada = $currentdate;
             $pengesahan->save();
 
-            $tangguhlelong = new TangguhLelong();
-            $tangguhlelong->lelong_id = $request->lelong_id;
-            $tangguhlelong->lelongbid_id = $bidmarhun;
-            $tangguhlelong->norujukan = $lelongbidmarhun[0]['norujukan'];
-            $tangguhlelong->pinjaman = $lelongbidmarhun[0]['pinjaman'];
+            $tangguhlelong = TangguhLelong::where('lelong_id', $request->lelong_id)
+            ->where('lelongbid_id', $bidmarhun)
+            ->where('norujukan', $lelongbidmarhun[0]['norujukan'])
+            ->first();
             $tangguhlelong->tarikhtangguh = $currentdate;
-            $tangguhlelong->ditangguh_oleh = $user->id;
-            $tangguhlelong->ditangguh_pada = $currentdate;
-            $tangguhlelong->nota = 'Tangguh Lelong PC';
             $tangguhlelong->save();
 
             $biddelete = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id')
diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php
index 810867d2..c286abd4 100644
--- a/resources/views/tangguhlelong/carian.blade.php
+++ b/resources/views/tangguhlelong/carian.blade.php
@@ -8,6 +8,10 @@
               <div class="alert alert-success" style="margin-top:1%;">
                   <p>{{ $message }}</p>
               </div>
+          @elseif ($message = Session::get('failed'))
+              <div class="alert alert-danger" style="margin-top:1%;">
+                  <p>{{ $message }}</p>
+              </div>
           @endif
             <h3 class="pt-3" style="margin-left:2%;">Sila Masukkan No Kad Pengenalan</h3>
             
@@ -23,14 +27,14 @@
                 
                 <div class="d-flex justify-content-center" style="margin:2% 0%; ">
                     <a  href="{{ route('tangguhlelong.senleluntuktangguh') }}" class="btn btn-primary mr-2">Kembali</a>
-                    <button type="button" class="btn btn-primary" onclick="carian()" >Carian</button>                  
+                    <button type="button" class="btn btn-primary" onclick="find()" >Carian</button>                  
                 </div>
             </form>
         </div>
     </div>
 </div>
 <script>
-    function carian() 
+    function find() 
     {  
        $("#formcariannokp").submit();
     }
diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php
index 4db10ef4..dd8cea4d 100644
--- a/resources/views/tangguhlelong/searchbyic.blade.php
+++ b/resources/views/tangguhlelong/searchbyic.blade.php
@@ -41,12 +41,22 @@
                             <td>{{$ic['pinjaman']}}</td>
                             <td>{{$ic['berat']}}</td>
                             <td class="text-center">
-                            <input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['id'] }}">
+                                @if(sizeof($ic['sdhadapengesahan']) !== 0)
+
+                                @else
+                                    <input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $ic['user_details'][0]['id'] }}" data-bidmarhun="{{ $ic['user_details'][0]['id'] }}">
+                                @endif
                             </td>
                         </tr>
                         @endforeach
                     </tbody>
                 </table>
+                <div class="form-group row">
+                    <label for="remark" class=" col-form-label mr-4" style="margin-left:2%;">Remark</label>
+                    <div>
+                      <input type="text" class="form-control" id="remark" name="remark" placeholder="**sebab tangguh lelong**">
+                    </div>
+                </div>
                 <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('tangguhlelong.carian', ['lelong_id'=>$lelong_id]) }}" class="btn btn-primary">Kembali</a>
                     <button type="submit" class="btn btn-danger">Tangguh Lelong</button>
@@ -70,6 +80,7 @@
                 btnClass: 'btn-warning',
                 action: function () {
                     location.href = this.$target.attr('href');
+                    $("#formtangguhlel").submit();
                 }
             },  
             Batal: {
@@ -88,6 +99,7 @@
         if(e.checked==true) //checkbox
         {
             arraybidmarhun.push(bidmarhun);
+
         }
         else
         {
@@ -116,7 +128,7 @@
         // "ordering": false,
         "info": false,
         "lengthChange": false,
-        "pageLength": 15,
+        "pageLength": 9999,
         dom: 'Bfrtip',
         // buttons: [
         //     // 'copy', 'excel', 'pdf'
diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php
index ab9b2f11..344278b0 100644
--- a/resources/views/tangguhlelong/sensahpc.blade.php
+++ b/resources/views/tangguhlelong/sensahpc.blade.php
@@ -26,6 +26,7 @@
                             <th>Nilai Marhun (RM)</th>                   
                             <th>Pembiayaan (RM)</th>                   
                             <th>Berat</th>              
+                            <th>Remark</th>              
                             <th class="text-center">Action</th>      
                         </tr>
                     </thead>
@@ -42,6 +43,7 @@
                             <td>{{$sah['bid_details'][0]['nilaimarhun']}}</td>
                             <td>{{$sah['bid_details'][0]['pinjaman']}}</td>
                             <td>{{$sah['bid_details'][0]['berat']}}</td>
+                            <td>{{$sah['nota']}}</td>
                             <td class="text-center">
                                 <input type="checkbox" onclick="bidmarhunfunc(this)" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $sah['bid_details'][0]['id'] }}" data-bidmarhun="{{ $sah['bid_details'][0]['id'] }}">
                             </td>
@@ -118,7 +120,7 @@
         // "ordering": false,
         "info": false,
         "lengthChange": false,
-        "pageLength": 15,
+        "pageLength": 9999,
         dom: 'Bfrtip',
         // buttons: [
         //     // 'copy', 'excel', 'pdf'