update

app/Http/Controllers/AccountController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
@@ -12,9 +13,11 @@ use App\Models\Lelong;
 use App\Models\Payment;
 use App\Models\LelongBid;
 use App\Models\LelongBidder;
+use App\Models\Resit;
 
 class AccountController extends Controller
 {
+
     public function senarailelongan(){
 
         $user = Auth::user();
@@ -72,10 +75,87 @@ class AccountController extends Controller
     public function sahsagonline($lelong_id, $user_id){
 
         $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id')
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('payment.status_payment_opt', 2)
+        ->get()->toArray();
+
+    //    dd($senaraisag);
+
+        $total_payment = 0;
+        foreach($senaraisag as $index1=>$sagbid){
+
+            if($sagbid['total_payment']){
+                $total_payment = $total_payment +$sagbid['total_payment'];
+            }
+
+            // $senaraisag[$index1]['totalPay'] = $total_payment;
+        }
+        // dd($senaraisag);
+        return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment'));
+    }
+
+    public function sahbayaronline($lelong_id, $user_id){
+        
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+
+        $user = Auth::user();
+
+        $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id')
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('payment.status_payment_opt', 2)
         ->get();
 
-        return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id'));
+        $total_payment = 0;
+        foreach($senaraisag as $sag)
+        {
+            $payment = Payment::where('lelong_id', $lelong_id)
+            ->where('user_id', $user_id)
+            ->where('lelongbid_id',$sag->lelongbid_id)
+            ->first();
+            $payment->disahkan_oleh = $user->id;
+            $payment->disahkan_pada = $currentdate;
+            $payment->save();
+
+            $total_payment = $total_payment + $payment->total_payment;
+
+            $updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
+            ->first();
+            $updatelelbidbidder->status_payment = 1;
+            $updatelelbidbidder->save();
+
+            $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
+            $eachbid->status_jual = 1;
+            $eachbid->t_jual = $currentdate;
+            $eachbid->save();
+
+            
+            
+        }
+        
+        $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbidder.status_bidder', 1)
+        ->get();
+        // dd($senaraisagallpayment);
+        $resit = Resit::where('id',$payment->resit_id)->first();
+        $resit->total_payment = $resit->total_payment + $total_payment;
+
+        if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
+        {
+            $resit->status = 'PAID';
+            $resit->paid_at = $currentdate;
+        }
+        $resit->save();
+        
+        return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya');
+
     }
 }

app/Http/Controllers/LelongController.php

@@ -448,11 +448,13 @@ class LelongController extends Controller
         $lelongbid = LelongBid::where('lelong_id','=',$id)->get();
         foreach($lelongbid as $bid)
         {
-            $highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.hargabida DESC' )->get();
+            $highestprice = LelongBidder::where('lelongbid_id','=',139)->orderBy('lelongbidder.hargabida','DESC' )->first();
+            // dd($highestprice->hargabida);
             if($highestprice)
             {
-                foreach($highestprice as $price){
-                    $bidders = LelongBidder::where('hargabida','=',$price->hargabida)->MIN('lelongbidder.masa_bidaan' )->get();
+                // foreach($highestprice as $price){
+                    $bidders = LelongBidder::where('lelongbid_id','=',139)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get();
+                    // dd($bidders);
                     $count = 0;
                     foreach($bidders as $bidder)
                     {
@@ -460,11 +462,12 @@ class LelongController extends Controller
                         if($count == 1)
                         {
                             $pemenang = LelongBidder::where('id','=',$bidder->id)
-                                ->first();
+                            ->first();
                             $pemenang->status_bidder = 1;
                             $pemenang->save();
-
+                            
                             $updatebid = LelongBid::where('id','=',$bid->id)->first();
+                            // dd($updatebid);
                             $updatebid->hargajual = $bidder->hargabida;
                             $updatebid->nopembeli = $bidder->user_id;
                             $updatebid->status_jual = 1;
@@ -501,7 +504,7 @@ class LelongController extends Controller
                             $kalah->save();
                         }
                     }
-                }
+                // }
                 
             }
             else

app/Http/Controllers/PaymentController.php

@@ -87,25 +87,22 @@ class PaymentController extends Controller
             'users.alamat'
             )
         ->first();
-
-        // foreach($SAGBidItem as $eachbid){
             
-            $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-            ->join('users', 'lelongbidder.user_id', '=', 'users.id')
-            ->where('lelongbidder.status_bidder', 1)
-            ->where('users.id', $user_id)
-            ->where('lelongbid.lelong_id', $lelong_id)
-            ->select('lelongbidder.hargabida',
-                     'lelongbid.hargaasas',
-                     'lelongbid.norujukan',
-                     'lelongbidder.lelongbid_id',
-                     'lelongbidder.status_payment'
-                     )
-            ->get();
+        $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->join('users', 'lelongbidder.user_id', '=', 'users.id')
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('users.id', $user_id)
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->select('lelongbidder.hargabida',
+                    'lelongbid.hargaasas',
+                    'lelongbid.norujukan',
+                    'lelongbidder.lelongbid_id',
+                    'lelongbidder.status_payment'
+                    )
+        ->get();
 
-        // }
 
-        return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id'));
+        return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id'));
     }
 
     public function paymentdenokaunter(Request $request){
@@ -119,6 +116,7 @@ class PaymentController extends Controller
         $bid_id = explode(",", $request->eachbid);
 
         $resit = Resit::where('lelong_id', $request->lelong_id)
+        ->where('user_id',$request->user_id)
             ->first();
             
         $total_hargabida = 0;
@@ -135,8 +133,9 @@ class PaymentController extends Controller
                      'lelongbid.lelong_id as lelong_id'
                      )
             ->first();
-
+            
             $total_hargabida = $total_hargabida + $eachbid->hargabida;
+            // dd($total_hargabida);
             $payment = Payment::create([
                 'user_id' => $request->user_id,
                 'lelongbidder_id' => $eachbid->lelongbidder_id,
@@ -166,18 +165,29 @@ class PaymentController extends Controller
             $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
             ->first();
             $updatelelbidbidder->status_payment = 1;
-            $updatelelbidbidder->update();
+            $updatelelbidbidder->save();
 
-            $eachbid->status_jual = 1;
-            $eachbid->t_jual = $currentdate;
-            $eachbid->update();
+            $eachbidupdate = LelongBid::where('id',$bid)->first();
+            $eachbidupdate->status_jual = 1;
+            $eachbidupdate->t_jual = $currentdate;
+            $eachbidupdate->save();
 
         }
-        if($request->amaunkiraan == $total_hargabida){
-            $resit->total_payment = $total_hargabida;
-            $resit->status = 'PAID';
-            $resit->paid_at = $currentdate;
-            $resit->update();
+        $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->where('lelongbid.lelong_id', $request->lelong_id)
+        ->where('lelongbidder.user_id', $request->user_id)
+        ->where('lelongbidder.status_bidder', 1)
+        ->get();
+        // dd(floatval($request->amaunkiraan));
+        if(floatval($request->amaunkiraan) == $total_hargabida){
+            // dd('hye');
+            $resit->total_payment = $resit->total_payment + $total_hargabida;
+            if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
+            {
+                $resit->status = 'PAID'; // $resit->status = 'PAID'; when hargabida >= total_payment di resit
+                $resit->paid_at = $currentdate;
+            }
+            $resit->save();
         }
         return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
     }

resources/views/account/listbayaranonline.blade.php

@@ -20,7 +20,6 @@
                         <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>
@@ -34,9 +33,6 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
                             <td>{{ $winner['totalPay']}}</td>
-                            <td>
-                                <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" ><i class="fas fa-download"></i></a>
-                            </td>
                             <td>
                                 <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} "><i class="far fa-edit"></i></a>
                             </td>
@@ -58,10 +54,6 @@
                 {
                 "targets": 7,
                 "orderable": false
-                },
-                {
-                "targets": 8,
-                "orderable": false
                 }
             ],
             order: [[1, 'asc']],

resources/views/account/sahsagonline.blade.php

@@ -4,48 +4,57 @@
 
 <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)
+            <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>
-                        <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>
+                            <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">Status</th>
                         </tr>
-                @endforeach
-            </tbody>
-        </table>
-        <div class="modal-footer">
-            <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
-        </div>
+                </thead>
+                <tbody>
+                    @foreach($senaraisag as $sag)
+                            <tr>
+                            <td> {{ $loop->iteration }} </td>
+                                <td>{{ $sag['norujukan'] }}</td>
+                                <td>{{ $sag['t_lelong'] }}</td>
+                                <td>{{ $sag['hargaasas'] }}</td>
+                                <td>{{ $sag['hargabida'] }}</td>
+                                <td>{{ $sag['masa_bidaan'] }}</td>
+                                <td>
+                                    <span class="btn btn-success btn-sm hovernone-success" disabled>PAID</span>                        
+                                </td>
+                            </tr>
+                    @endforeach
+                </tbody>
+            </form> 
+            <tr>
+            <td colspan="2"><b> Jumlah Bayaran</b></td>
+            <td colspan="2"></td>
+            <td colspan="1"><b>RM<input type="text" id="total" value="{{ $total_payment }}" style="border: none;" readonly></b></td>
+            <td colspan="2"></td>
+            </tr>
+            </table>
+            <div class="modal-footer" style="margin-top:2%;">
+                <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
+                <a  href="{{ route('account.sahbayaronline', ['lelong_id'=>$lelong_id, 'user_id'=>$user_id]) }}" class="btn btn-warning">Sahkan</a>
+            </div>
         </div>
     </div>
 </div>
 
 <script>
+
     var tablekaunter = $('#tablekaunter').DataTable({
             "columnDefs": [ 
                 {

resources/views/pembayaran/SAGBidItem.blade.php

@@ -63,7 +63,7 @@
   <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
   <form action="{{ route('pembayaran.paymentdenokaunter') }}" method="POST" id="formpaymentdenokaunter">
                     @csrf
-    <input type="hidden" name="user_id" value="{{ $SAGBidItem->id }}" />
+    <input type="hidden" name="user_id" value="{{ $user_id }}" />
     <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
     <input type="hidden" name="eachbid" id="eachbid" value="" />
 

resources/views/pembayaran/senarailelongbayaran.blade.php

@@ -25,7 +25,7 @@
                     <td>{{$loop->iteration}}</td>
                     <td>{{ $data->tarikh_lelong }}</td>
                     <td>{{ $data->sts_lelong }}</td>
-                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['id']]) }} "><i class="far fa-edit"></i></a></td>
+                    <td><a href=" {{ route('pembayaran.kaunterpembayaran', ['lelong_id'=>$data['lelong_id']]) }} "><i class="far fa-edit"></i></a></td>
                 </tr>
                 @endforeach
             </tbody>

routes/web.php

@@ -161,6 +161,7 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
     Route::get('/senarailelongan', ['as'=>'account.senarailelongan','uses'=>'AccountController@senarailelongan']);
     Route::get('/listbayaranonline/{lelong_id}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
     Route::get('/sahsagonline/{lelong_id}/{user_id}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
+    Route::get('/sahbayaronline/{lelong_id}/{user_id}', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
 
 });
 // Account
@@ -170,6 +171,4 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
     Route::get('/senarainotis/{lelong_id}',['as'=>'jananotis.senarainotis','uses'=>'NotisController@senarainotis']); 
     Route::get('/jananotis/{lelong_id}',['as'=>'jananotis.jananotis','uses'=>'NotisController@jananotis']); 
 
-
-
 });