diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 828d6602..b8337273 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -930,10 +930,10 @@ class LelongController extends Controller
         return $pdf->download('Senarai Lelong Tak Laku.pdf');
     }
 
-    public function senaraipemenang($lelong_id, $caw_code){
+    public function senaraipemenang(Request $request, $lelong_id){
 
+        $caw_code = $request->caw_code;
              
-
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index 94fedd2d..f9e3f621 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -18,6 +18,8 @@ use App\Models\Gadai;
 use App\Models\Daerah;
 use App\Models\Negeri;
 use App\Models\Tetapan;
+use App\Models\Customer;
+
 use Carbon\Carbon;
 use PDF;
 use DateTime;
@@ -60,27 +62,50 @@ class NotisController extends Controller
     public function senarainotis($lelong_id){
 
         $user =  Auth::user();
+        $bayaran=0;
 
         $caw = Cawangan::where('caw_code','=',$user->kodcaw)
         ->first();
 
         $lelong_id = $lelong_id;
 
-        $senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->where('gadai.kodcaw','=',$user->kodcaw)
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();     
+        $senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
+        ->where('lelongbid.lelong_id', $lelong_id);
 
-        $bayaran=0;
-        foreach($senarai as $index1=>$notis)
+        $arraysenarai = $senarai->pluck('norujukan')->toArray();
+        $datasenarai = $senarai->get();
+
+        $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
+        ->get()->toArray();
+
+        // $gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
+        // ->where('gadai.kodcaw','=',$user->kodcaw);
+
+        
+        // $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
+        // $datacustomer = $gadaicaw2->get();
+        // // dd($gadaicaw2);
+        // $customer = Customer::on($datacustomer[0]['kodcaw'])
+        // ->whereIn('kpbaru',$arraycustomer)
+        // ->orWhereIn('kplama',$arraycustomer)            
+        // ->get()->toArray();       
+
+
+        // $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
+        // ->select('nokp')
+        // ->groupBy('nokp')
+        // ->get()->toArray();
+        // dd($gadaicaw);
+
+        foreach($gadaicaw as $index1=>$notis)
         {
             $bayaran = $notis['hargajualan'] - $notis['bakihargajualan'];
         }
 
-        $senarai[$index1]['payment'] = $senarai;
-        $senarai[$index1]['bayaran_keuntungan'] = $bayaran;
+        // $gadaicaw[$index1]['payment'] = $payment;
+        // $gadaicaw[$index1]['bayaran_keuntungan'] = $bayaran_keuntungan;
 
-        return view('jananotis.senarainotis',compact('senarai','lelong_id','bayaran'));
+        return view('jananotis.senarainotis',compact('gadaicaw','lelong_id','bayaran'));
 
     }
 
@@ -128,31 +153,58 @@ class NotisController extends Controller
 
         $lelong_id = $request->lelong_id;
 
-        $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
-        ->join('customer', function ($join) {
-        $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
-        })       
+        $senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
+        ->where('lelongbid.lelong_id', $lelong_id);
+
+        $arraysenarai = $senarai->pluck('norujukan')->toArray();
+        $datasenarai = $senarai->get();
+
+        $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
         ->where('gadai.kodcaw','=',$user->kodcaw)
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get()->toArray();      
+        ->get()->toArray();
 
         $bayaran=0;
-        foreach($payment as $index1=>$pay)
+        foreach($gadaicaw as $index1=>$pay)
         {
             $bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
         }
 
-        $payment[$index1]['payment'] = $payment;
-        $payment[$index1]['bayaran_keuntungan'] = $bayaran;
+        $gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
+        ->where('gadai.kodcaw','=',$user->kodcaw);
+
+        
+        $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
+        $datacustomer = $gadaicaw2->get();
+        // dd($gadaicaw2);
+        $customer = Customer::query()
+        ->whereIn('kpbaru',$arraycustomer)
+        ->orWhereIn('kplama',$arraycustomer)            
+        ->get()->toArray();     
+        
+
+        
+        //  $customer[$index1]['listsag'] = $listsag;
+
+        // ->join('customer', function ($join) {
+        //     $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
+        //     })       
+        //     ->where('gadai.kodcaw','=',$user->kodcaw)
+        //     ->where('lelongbid.lelong_id', $lelong_id)
+        // ->get()->toArray();   
+
+
+        // $payment[$index1]['payment'] = $payment;
+        // $payment[$index1]['bayaran_keuntungan'] = $bayaran;
 
         if($request->type == 'excel')
         {
-            return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran'));
+
+            return view('excel.listnotis_excel',compact('gadaicaw','caw','lelong_id','bayaran','customer'));
 
         }
         else
         {
-            $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran'))
+            $pdf = PDF::loadView('pdf.listnotis',compact('gadaicaw','caw','lelong_id','bayaran'))
             ->setPaper('a4', 'potrait');
             
             return $pdf->download('Senarai Notis.pdf');
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index b88c1a3f..cde144c3 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -140,7 +140,8 @@ class ReportController extends Controller
         $marhuns[$index1]['listsag'] = $listsag;
 
 
-        $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas','total_berat','datasimulasi'))
+        $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas',
+        'total_berat','datasimulasi'))
         ->setPaper('a4', 'landscape');
             
         return $pdf->download('Senarai Barang Lelong.pdf');
diff --git a/database/seeders/KaratSeeder.php b/database/seeders/KaratSeeder.php
index 92cf0b09..11952881 100644
--- a/database/seeders/KaratSeeder.php
+++ b/database/seeders/KaratSeeder.php
@@ -80,6 +80,13 @@ class KaratSeeder extends Seeder
             'dariharga916' => -139.71
         ]);
 
+        Tetapan::create([
+            'tetap_tarikh_lelong' => '2022-07-31',
+            'kali' => '1',
+            'cajlelong' => '3'
+            
+        ]);
+
         
 
     }
diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php
index a4dc8ad0..4c562f9b 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -72,16 +72,16 @@
                     <th align="left">Bayaran Telah Dibuat</th>
                 </tr>
             </thead>
-            @foreach($payment as $pay)
+            @foreach($customer as $index1=> $pay)
                         <tr>
                             <td align="left">{{ $loop->iteration }} </td>
                             <td align="left">{{ $pay['nama']}}</td>
-                            <td align="left">{{ $pay['norujukan']}}</td>
+                            <td align="left">{{ $gadaicaw[$index1]['norujukan'] }}</td>
                             <td align="left">6{{ $pay['telefon']}}</td>
-                            <td align="left">{{ $pay['tempoh']}}</td>
-                            <td align="left">{{ $pay['nokp']}}</td>
-                            <td align="left">{{ number_format($pay['pinjaman'], 2, '.', ',')}}</td>
-                            <td align="left">{{ number_format($pay['bakiupah'], 2, '.', ',')}}</td>
+                            <td align="left">{{ $gadaicaw[$index1]['tempoh'] }}</td>
+                            <td align="left">{{ $gadaicaw[$index1]['nokp'] }}</td>
+                            <td align="left">{{ number_format($gadaicaw[$index1]['pinjaman'], 2, '.', ',')}}</td>
+                            <td align="left">{{ number_format($gadaicaw[$index1]['bakiupah'], 2, '.', ',')}}</td>
                             <td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td>
 
                 @endforeach
diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php
index 7a8976eb..ef3530bb 100644
--- a/resources/views/jananotis/senarainotis.blade.php
+++ b/resources/views/jananotis/senarainotis.blade.php
@@ -30,7 +30,7 @@
                     </tr>
             </thead>
             <tbody>
-                @foreach($senarai as $notis)
+                @foreach($gadaicaw as $index1=> $notis)
                         <tr>
                             <td>{{ $loop->iteration }} </td>
                             <td>{{ $notis['norujukan']}}</td>
diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php
index fa5b6881..110253ee 100644
--- a/resources/views/lelong/showsimulasi.blade.php
+++ b/resources/views/lelong/showsimulasi.blade.php
@@ -215,7 +215,7 @@
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
             </div>
-            @endif
+            @endif+
             {{-- {{$cawangan[0] }} --}}
         </div>
         <div class="modal fade" tabindex="-1" id="modalfilter">
diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php
index bba1ecf0..9e6a2d6e 100644
--- a/resources/views/pdf/jananotis.blade.php
+++ b/resources/views/pdf/jananotis.blade.php
@@ -126,7 +126,7 @@
   </style>
 
 
-@foreach ($payment as $notis)
+@foreach ($gadaicaw as $notis)
 
             <div class="container">
               <table id="header">
@@ -184,13 +184,13 @@
                     <td> </td>
                     <td width="14%">NO TELEFON</td>
                     <td width="1%">:</td>
-                    <td>{{$notis['telefon'] }}</td>
+                    {{-- <td>{{$notis['telefon'] }}</td> --}}
             
                   </tr>
                   <tr>
                     <td style="vertical-align:top;">KEPADA</td>
                     <td style="vertical-align:top;">:</td>
-                    <td style="vertical-align:top;">{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}}</td>
+                    {{-- <td style="vertical-align:top;">{{ $notis['nama'] }}<br> {{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '<br>' . strtoupper($notis['alamat2']) !!} <br> {{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['namadaerah']) . ' ' . strtoupper($notis['negeri'])}}</td> --}}
                     <td></td>
                     <td> </td>
                     <td> </td>
diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php
index bfbd3c44..8fbc66ef 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -100,7 +100,7 @@ tr:nth-child(even) {
         
                                 </tr>
                                 </thead>
-                            @foreach($payment as $pay)
+                            @foreach($gadaicaw as $index1=> $pay)
                             <tr>
                                 <td align="left">{{ $loop->iteration }} </td>
                                 <td align="left">{{ $pay['norujukan']}}</td>