Merge branch 'faiqahzaman'

app/Http/Controllers/LelongController.php

@@ -610,7 +610,7 @@ class LelongController extends Controller
     }
 
     public function senaraipemenang($lelong_id){
-        
+
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
@@ -618,13 +618,33 @@ class LelongController extends Controller
         )
         ->groupBy('lelongbidder.user_id')
         ->get()->toArray();
+        // dd($listwinner);
 
-        $senaraiwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
-        ->join('users', 'lelongbidder.user_id', '=', 'users.id')
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->get();
+        foreach($listwinner as $index1=>$winner){
+
+            $userdetails = User::where('id', $winner['user_id'])->first();
+            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('user_id', $winner['user_id'])
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->get();
+
+            $listwinner[$index1]['details'] = $userdetails;
+            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
+        }
         
-        return view('lelong.senaraipemenang',compact('senaraiwinner','lelong_id'));
+        return view('lelong.senaraipemenang',compact('listwinner','lelong_id'));
+    }
+
+    public function senaraisagpemenang($user_id, $lelong_id){
+        
+        $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbidder.user_id', $user_id)
+        ->get();
+
+        return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
     }
 
     public function senaraimarhun($lelongid, $cawid){

app/Http/Controllers/PaymentController.php

@@ -46,9 +46,7 @@ class PaymentController extends Controller
         foreach($listwinner as $index1=>$winner){
 
             $userdetails = User::where('id', $winner['user_id'])->first();
-            // dd($userdetails);
             $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-            // ->join('payment', 'lelongbidder.lelongbid_id', '=', 'payment.lelongbid_id')
             ->where('user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
@@ -58,7 +56,6 @@ class PaymentController extends Controller
             foreach($SAGWin as $SAG){
                 $payment = Payment::where('lelongbid_id', $SAG->lelongbid_id)
                 ->first();
-                // dd($payment->total_payment);
 
                 if($payment){
                     $total_payment = $total_payment + $payment->total_payment;

resources/views/lelong/senaraipemenang.blade.php

@@ -19,28 +19,20 @@
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Bidaan(RM)</th>
-                        <th>Jumlah Pembayaran(RM)</th>
-                        <th>Penyata Bayaran</th>
                         <th class="text-center">Action</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($senaraiwinner as $winner)
+                @foreach($listwinner as $winner)
                         <tr>
-                            <td> {{ $loop->iteration }} </td>
-                            <td>{{ $winner['name']}}</td>
-                            <td>{{ $winner['nokp']}}</td>
-                            <td>{{ $winner['notelbimbit']}}</td>
+                        <td> {{ $loop->iteration }} </td>
+                            <td>{{ $winner['details']['name']}}</td>
+                            <td>{{ $winner['details']['nokp']}}</td>
+                            <td>{{ $winner['details']['notelbimbit']}}</td>
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
-                            <td>{{ $winner['totalPay']}}</td>
                             <td>
-                                <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" ><i class="fas fa-download"></i></a>
-                            </td>
-                            <td>
-                                @if( $winner['totalPay'] < $winner['totalBid'] )    
-                                    <a href=" {{ route('pembayaran.SAGBidItem', ['user_id'=>$winner['id'], 'lelong_id'=>$lelong_id]) }} "><i class="far fa-edit"></i></a>
-                                @endif
+                            <a href=" {{ route('lelong.senaraisagpemenang', ['lelong_id'=>$lelong_id, 'user_id'=>$winner['user_id']]) }} "><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
@@ -58,10 +50,6 @@
                 "orderable": false
                 }, 
                 {
-                "targets": 7,
-                "orderable": false
-                },
-                {
                 "targets": 6,
                 "orderable": false
                 }

resources/views/lelong/senaraisagpemenang.blade.php

@@ -0,0 +1,45 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>No Rujukan</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Harga Asas (RM)</th>
+                        <th>Harga Bida (RM)</th>
+                        <th>Masa Bidaan</th>
+                        <th class="text-center">Action</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($senaraisag as $senaraisag)
+                        <tr>
+                        <td> {{ $loop->iteration }} </td>
+                            <td>{{ $senaraisag['norujukan']}}</td>
+                            <td>{{ $senaraisag['t_lelong']}}</td>
+                            <td>{{ $senaraisag['hargaasas']}}</td>
+                            <td>{{ $senaraisag['hargabida']}}</td>
+                            <td>{{ $senaraisag['masa_bidaan']}}</td>
+                            <td>
+                            <input type="checkbox" aria-label="Checkbox for following text input" >
+                            </td>
+                        </tr>
+                @endforeach
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+@endsection

routes/web.php

@@ -78,14 +78,13 @@ Route::group(['prefix'=>'lelong'], function () {
         Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); 
         Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
         Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']);
+        Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']);
         Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']);
         Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
         Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); 
         Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); 
         Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']);
         Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']);
-        Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']);
-        Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']);
 
         Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']);
         Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']);