From 0a078a4725282ab14748121d68f759f85d5b9bd1 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli <zatizul@gmail.com>
Date: Mon, 10 Oct 2022 16:06:31 +0800
Subject: [PATCH] update changes coding kak nisha

---
 app/Http/Controllers/PembidaController.php    | 68 +++++--------------
 .../pembida/senlelbelumbayarbidaan.blade.php  | 31 ++-------
 2 files changed, 23 insertions(+), 76 deletions(-)

diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index bd2a1cd4..06551898 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -213,61 +213,27 @@ class PembidaController extends Controller
         return view('pembida.senlelpembayaranbidaan',compact('lelong','arrayinfo'));
     }
 
+   
+
     public function senlelbelumbayarbidaan(Request $request)
     {
-        // //$kodcaw = $request->kodcaw;
-
-
-        // //$arrayinfo = [];
-
-        // $lelong = LelongBid::join('cawangan_lelong','lelongbid.lelong_id','=','cawangan_lelong.lelong_id')
-        // ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
-        // ->join('lelong','lelong.id','=','lelongbid.lelong_id')
-        // ->join('cawangan','cawangan.id','=','lelongbid.caw_id')
-        // ->select('lelongbid.lelong_id','lelongbid.caw_id','lelongbid.kodcaw','lelongbid.t_lelong','lelong.sts_lelong','cawangan.caw_name')
-        // ->distinct()
-        // ->orderBy('lelongbid.lelong_id')
-        // ->where('lelongbid.status_jual', 1)  
-        // ->where('lelong.sts_lelong', 3) 
-        // ->where(function($query){
-        //     $query->whereNull('lelongbidder.status_payment')
-        //         ->orWhere('lelongbidder.status_payment',2)
-        //         ->where('lelongbidder.status_bidder', 1);
-        // })  
-        // ->get();
-        // //->toArray();
-        // dd($lelong);
-
         $kodcaw = $request->kodcaw;
-
-
-        $arrayinfo = [];
-
-        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        $lelong = LelongBid::join('cawangan_lelong','lelongbid.lelong_id','=','cawangan_lelong.lelong_id')
+        ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->join('lelong','lelong.id','=','lelongbid.lelong_id')
+        ->join('cawangan','cawangan.id','=','lelongbid.caw_id')
+        ->select('lelongbid.lelong_id','lelongbid.caw_id','lelongbid.kodcaw','lelongbid.t_lelong','lelong.sts_lelong','cawangan.caw_name')
         ->distinct()
-        ->orderBy('lelong_id')
-        ->where('lelong.sts_lelong', 3)     
-        ->get()
-        ->toArray();
-
-        foreach($lelong as $details)
-        {
-
-            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code','cawangan_lelong.export_data_sts')
-            ->where('lelong_id',$details['lelong_id'])    
-            ->distinct()
-            ->orderBy('lelong_id')
-            ->get()
-            ->toArray();
-            // dd($detailsinfo);
-            
-            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
-        }
-
-        
-        return view('pembida.senlelbelumbayarbidaan', compact('lelong','arrayinfo'));
+        ->orderBy('lelongbid.lelong_id')
+        ->where('lelongbid.status_jual', 1)  
+        ->where('lelong.sts_lelong', 3) 
+        ->where(function($query){
+            $query->whereNull('lelongbidder.status_payment')
+                ->orWhere('lelongbidder.status_payment',2)
+                ->where('lelongbidder.status_bidder', 1);
+        })  
+        ->get();
+        return view('pembida.senlelbelumbayarbidaan', compact('lelong'));
     }
 
     public function pembayaranbidaan(Request $request)
diff --git a/resources/views/pembida/senlelbelumbayarbidaan.blade.php b/resources/views/pembida/senlelbelumbayarbidaan.blade.php
index 488163b1..5dba6f53 100644
--- a/resources/views/pembida/senlelbelumbayarbidaan.blade.php
+++ b/resources/views/pembida/senlelbelumbayarbidaan.blade.php
@@ -18,45 +18,26 @@
                         <th>ID Lelong</th>
                         <th>Tarikh Lelong</th>
                         <th>Cawangan</th>
-                        <th>Status Export</th>
-                        <th>Harga Emas Semasa</th>
-                        <th>Tempoh</th>
-                        <th>Caj Lelong</th>
                         <th>Status Lelong</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($arrayinfo as $lel)
+                @foreach($lelong as $index=> $lel)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
-                    <td>{{ $lel['detail']['lelong_id']}}</td>
+                    <td>{{ $lel['lelong_id']}}</td>
                     <td>@php
-                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                         $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['t_lelong'] );
                         $t_lelong =  $myDateTime->format('d-m-Y');
                         echo($t_lelong);
                     @endphp</td>
                     <td class="text-left">
-                        @foreach($lel['detailsinfo'] as $details)
-                        <a href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$lel['detail']['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
-                        <span class="m-2">{{ $details['caw_name']}}
+                        <a href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                        <span class="m-2">{{ $lel['caw_name']}}
                         </span><br>
-                        @endforeach
                     </td>
-                    <td class="text-left">
-                        @foreach($lel['detailsinfo'] as $details)
-                        <span class="m-2"> @if($details['export_data_sts'] == '1')
-                        <i class="far fa-flag"></i> Selesai Export
-                        
-                        @endif
-                    
-                        </span><br>
-                        @endforeach
-                    </td>
-                    <td>{{ $lel['detail']['harga_emas_asas'] }}</td>
-                    <td>{{ $lel['detail']['jbg'] }}</td>
-                    <td>{{ $lel['detail']['cajlelong'] }}</td>
                     <td>
-                        @if($lel['detail']['sts_lelong'] == 3)
+                        @if($lel['sts_lelong'] == 3)
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                         @endif
                     </td>