diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 648d07c..bbf648d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -1581,7 +1581,7 @@ class KhazanahController extends Controller
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json();
 
-        return view('khazanah.laporan.lelongan',compact('cawangan_info','api_url','senaraibatch'));
+        return view('lelongan.lelongan',compact('cawangan_info','api_url','senaraibatch'));
     }
 
     public function cetaklaporanLelongan(Request $request){
@@ -1612,12 +1612,14 @@ class KhazanahController extends Controller
         }else if($request->jeniscetakan === 'pdf'){
 
             $lelong = Http::get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json();
+            $notislelong = Http::get(config('api.url'). '/api/details/notislelong/'. $auth_user['cawangan'])->json();
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();    
             $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
             $cawangan_detail=$cawangan[0];
         
-            
-            $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait');
+            // return view('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'));
+
+            $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait');
             return $pdf->download('notislelong_'.$tarikh_cetak.'.pdf');
           
             // return $pdf->stream('notislelong_'.$tarikh_cetak.'.pdf');
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index b785ae0..7e35f88 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -38,10 +38,12 @@ class LelongController extends Controller
     }
     
     public function lelong(){
-        $api_url = config('api.url');
         $auth_user = Auth::user();
+        $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('khazanah.lelong',compact('cawangan_info','api_url'));
+        $senaraibatch = Http::get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json();
+
+        return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatch'));
     }
 
     public function resittuntutbaki($norujukan){
diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index d2252af..e3a2147 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -203,7 +203,7 @@
                 <a href="{{ url('capaian') }}" class="btn btn-info btn-lg btn-block mb-3">Capaian</a>
             </div>
             <div class="row">
-                <a href="{{ route('lelong') }}" class="btn btn-danger btn-lg btn-block mb-3">Lelong</a>
+                <a href="{{ route('lelong') }}" class="btn btn-info btn-lg btn-block mb-3">Lelong</a>
             </div>
             <div class="row">
                 <a href="{{ url('panjar') }}" class="btn btn-info btn-lg btn-block mb-3">Perbelanjaan</a>
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php
index 8b857ba..b4094f1 100644
--- a/resources/views/khazanah/laporan/index.blade.php
+++ b/resources/views/khazanah/laporan/index.blade.php
@@ -20,7 +20,8 @@
                                 <a href="{{ route('laporan.gadaian') }}" class="btn btn-dark btn-lg btn-block mb-3">Gadaian</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.lelongan') }}" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a>
+                                {{-- <a href="{{ route('laporan.lelongan') }}" class="btn btn-dark btn-lg btn-block mb-3">Lelongan</a> --}}
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Lelongan</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block  mb-3">Pelanggan Baru</a>
diff --git a/resources/views/khazanah/laporan/lelongan.blade.php b/resources/views/khazanah/laporan/lelongan.blade.php
index d087f02..5984e56 100644
--- a/resources/views/khazanah/laporan/lelongan.blade.php
+++ b/resources/views/khazanah/laporan/lelongan.blade.php
@@ -23,6 +23,7 @@
                     <div class="row">
                         <div class="col-md-12">
                           
+                            @if(sizeof($senaraibatch) !== 0)
                             <table class="table table-bordered table-striped">
                                 <thead class="bg-dark">
                                   <tr>
@@ -49,6 +50,11 @@
                                     @endforeach
                                 </tbody>
                               </table>
+                            @else 
+                            <div class="alert alert-danger" role="alert">
+                                Tiada Data dalam lelong!
+                              </div>
+                            @endif
 
                         </div>
                     </div>
diff --git a/resources/views/khazanah/lelong.blade.php b/resources/views/khazanah/lelong.blade.php
index 87fbe69..0d88dda 100644
--- a/resources/views/khazanah/lelong.blade.php
+++ b/resources/views/khazanah/lelong.blade.php
@@ -2,16 +2,68 @@
 
 @section('content')
 <div class="container">
-    <div class="row justify-content-center">
+    <div class="row">
         <div class="col-md-12">
             <div class="card">
-                <div class="card-header">{{ __('Lelong') }}</div>
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Lelongan</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                          
+                            @if(sizeof($senaraibatch) !== 0)
+                            <table class="table table-bordered table-striped">
+                                <thead class="bg-dark">
+                                  <tr>
+                                    <th scope="col">No.</th>
+                                    <th scope="col">Batch No.</th>
+                                    <th scope="col">Bilangan Aktif</th>
+                                    <th scope="col">Tarikh Lelong</th>
+                                    <th scope="col">Action</th>
+                                  </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($senaraibatch as $index=>$sb)
+                                        <tr>
+                                            <td>{{ $loop->iteration }}</td>
+                                            <td>{{ $sb['batchno'] }}</td>
+                                            <td class="text-danger font-weight-bold">{{ $sb['total'] }}</td>
+                                            <td>{{ $sb['t_lelong'] }}</td>
+                                            <td class="text-center">
+                                                <a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'cetak','batchno' => $sb['batchno']]) }}" class="btn btn-info text-white">Cetak</a>
+                                                <a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'excel','batchno' => $sb['batchno']]) }}" target="_blank" class="btn btn-success text-white">Excel</a>
+                                                <a href="{{ route('lelongan.laporancetak', ['jeniscetakan' => 'pdf','batchno' => $sb['batchno']]) }}" target="_blank" class="btn btn-danger text-white">PDF</a>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                              </table>
+                            @else 
+                            <div class="alert alert-danger" role="alert">
+                                Tiada Data dalam lelong!
+                              </div>
+                            @endif
+
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                          
+                        </div>
+                    </div>
+                    <div class="row">
 
-                <div class="card-body text-center mx-auto">
-                    <div>Tarikh Lelong</div>
-                    <div class="input-group mb-3">
-                        <input type="text" class="form-control" placeholder="Tarikh Lelong" aria-label="Tarikh Lelong" aria-describedby="button-addon2">
-                        <button class="btn btn-primary" type="button" id="button-addon2">Button</button>
                     </div>
                 </div>
             </div>
@@ -20,5 +72,27 @@
 </div>
 <script>
 
+    // function FuncPrint(meth)
+    // {
+    //     let jeniscetakan = meth.value;
+
+    //     if(jeniscetakan === 'cetak')
+    //     {
+    //         let urlroute = '{{ route("lelongan.laporancetak", ":id") }}';
+    //         urlroute = urlroute.replace(':id', jeniscetakan);
+    //         window.open(urlroute, '_blank');
+
+    //     }else if(jeniscetakan === 'excel')
+    //     {
+    //         let urlroute = '{{ route("lelongan.laporancetak", ":id") }}';
+    //         urlroute = urlroute.replace(':id', jeniscetakan);
+    //         window.open(urlroute, '_blank');
+
+    //     }else{
+    //         console.log('tiada cetakan');
+    //     }
+    // }
+
 </script>
-@endsection
\ No newline at end of file
+@endsection
+
diff --git a/resources/views/print/notislelong.blade.php b/resources/views/print/notislelong.blade.php
index c891656..f38a8e5 100644
--- a/resources/views/print/notislelong.blade.php
+++ b/resources/views/print/notislelong.blade.php
@@ -7,7 +7,7 @@
 
 #header td, #customers th {
  
-  padding:4px;
+  padding-left:4px;
   font-size:12px;
 }
 
@@ -19,7 +19,7 @@
   /* padding-top: 12px;
   padding-bottom: 12px; */
   text-align: left;
-  padding:4px;
+  /* padding:4px; */
   color:black;
 }
 </style>
@@ -130,28 +130,28 @@
       <th colspan="1">{{ $cawangan_detail['namacaw'] }}</th>
     </tr>
     <tr>
-      <td>{{ $cawangan_detail['alamat1'] }}</td>
+      <td style="vertical-align:top;">{{ $cawangan_detail['alamat1'] }}</td>
       <td></td>
     </tr>
     <tr>
-      <td>{{ $cawangan_detail['alamat2'] }}</td>
+      <td style="vertical-align:top;">{{ $cawangan_detail['alamat2'] }}</td>
       <td></td>
     </tr>
     <tr>
-      <td>{{ ' No Tel : '. $cawangan_detail['notel'] . ' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+      <td style="vertical-align:top;">{{ ' No Tel : '. $cawangan_detail['notel'] . ' No Faks : '. $cawangan_detail['nofaks'] }}</td>
       <td></td>
     </tr>
   </table>
-  <br><br>
+  <br>
 
 
   <div>
     <table class="tablestyle">
       <tr>
-        <td>TARIKH CETAK 
+        <td width="15%">TARIKH CETAK 
         </td>
-        <td>:</td>
-        <td width="10%">@php 
+        <td width="1%">:</td>
+        <td width="43%">@php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
               $datez = $myDateTime->format('d-m-Y');
               echo($datez);
@@ -167,24 +167,22 @@
         <td>:</td>
         <td>{{ $lel['norujukan'] }}</td>
         <td> </td>
-        <td>NO TELEFON</td>
-        <td>:</td>
+        <td width="14%">NO TELEFON</td>
+        <td width="1%">:</td>
         <td>{{ $lel['telefon1'] }}</td>
 
       </tr>
       <tr>
-        <td>KEPADA</td>
-        <td>:</td>
-        <td>{{ $lel['nama'] }}<br> {{ strtoupper($lel['alamat']) }}<br> {{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}</td>
+        <td style="vertical-align:top;">KEPADA</td>
+        <td style="vertical-align:top;">:</td>
+        <td style="vertical-align:top;">{{ $lel['nama'] }}<br> {{ strtoupper($lel['alamat']) }} {!! ($lel['alamat2'] === null || $lel['alamat2'] === '') ? '' : '<br>' . strtoupper($lel['alamat2']) !!} <br> {{ ' ' . $lel['poskod'] . ' ' . strtoupper($lel['daerah']) . ' ' . strtoupper($lel['negeri'])}}</td>
         <td></td>
-        <td>NO K/P</td>
-        <td>:</td>
-        <td> {{ $lel['IC'] }}</td>
+        <td style="vertical-align:top;">NO K/P</td>
+        <td style="vertical-align:top;">:</td>
+        <td style="vertical-align:top;"> {{ $lel['IC'] }}</td>
       </tr>
     </table>
 
-    <br>
-
     <p>Tuan/Puan,</p>
     <h4>LELONGAN BARANGAN GADAIAN SECARA TENDER PADA 
       @php 
@@ -229,14 +227,13 @@
       @endphp:-</b></p>
 
     {{-- Customise Ayat pelelong--}}
-    <p>1. Tebus sepenuhnya</p>
+    {{-- {!! nl2br(e($notislelong[0]['para2'])) !!} --}}
+    @php echo $notislelong[0]['para2']; @endphp
+    {{-- <p>1. Tebus sepenuhnya</p>
     <p>2. Tebus gadai semula</p>
-    <p>2. Bayar upah sepenuhnya dan tempoh akan dilanjutkan sehingga 12 bulan bagi tempoh gadaian.</p>
-    <br>
+    <p>2. Bayar upah sepenuhnya dan tempoh akan dilanjutkan sehingga 12 bulan bagi tempoh gadaian.</p> --}}
     {{-- Customise Ayat pelelong --}}
-    <p>Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut.</p>  
-    <i>*Permohonan tangguh lelong adalah tidak dibenarkan.</i>
-    <br>
+    {{-- <p>Sekiranya tuan/puan masih tidak berurusan sehingga tarikh dinyatakan, maka pihak kami berhak menjual secara lelongan awam barang gadaian tersebut.</p>   --}}
     <p>Notis:</p>
     <i>Sila bawa bersama Surat Akaun Gadai (SAG) untuk sebarang urusan.</i>
     <br>