Merge branch 'amirah' into 'main'

account: bayaran atas talian group by lelong id, date format etc..

See merge request online-sistem1/lelong!87

app/Http/Controllers/AccountController.php

@@ -23,15 +23,34 @@ class AccountController extends Controller
 
         $user = Auth::user();
 
-        $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->where('lelong.sts_lelong', 3)
-        ->get();
+        $arrayinfo = [];
 
-        return view('account.senarailelongan',compact('senarai'));
+        $senarai =  Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong_id','tarikh_lelong','fasa','sts_lelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->where('lelong.sts_lelong', 3)     
+        ->get()
+        ->toArray();
+
+        foreach($senarai 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')
+            ->where('lelong_id',$details['lelong_id'])    
+            ->distinct()
+            ->orderBy('lelong_id')
+            ->get()
+            ->toArray();
+            
+            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+        }
+
+        return view('account.senarailelongan',compact('senarai','arrayinfo'));
     }
 
-    public function listbayaranonline($lelong_id, $caw_code)
+    public function listbayaranonline($lelong_id, $kodcaw)
     {
         // $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
         // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
@@ -40,13 +59,13 @@ class AccountController extends Controller
         // ->select('cawangan.caw_name')
         // ->get();
 
-        $getkodcaw = Cawangan::where('caw_code', $caw_code)->select('caw_name')->first();
+        $getkodcaw = Cawangan::where('caw_code', $kodcaw)->select('caw_name')->first();
 
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', 'payment.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('lelongbid.kodcaw', $caw_code)
+        ->where('lelongbid.kodcaw', $kodcaw)
         ->where('payment.status_payment_opt', 3)
         ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
@@ -96,7 +115,7 @@ class AccountController extends Controller
         }
 
 
-        return view('account.listbayaranonline',compact('listwinner','lelong_id', 'getkodcaw', 'caw_code'));
+        return view('account.listbayaranonline',compact('listwinner','lelong_id', 'getkodcaw', 'kodcaw'));
     }
 
     public function sahsagonline($lelong_id, $user_id, $caw_code)

app/Http/Controllers/PembidaController.php

@@ -185,8 +185,7 @@ class PembidaController extends Controller
         ->select('lelong_id','tarikh_lelong','fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->distinct()
         ->orderBy('lelong_id')
-        ->where('lelong.sts_lelong', 3)
-     
+        ->where('lelong.sts_lelong', 3)     
         ->get()
         ->toArray();
 
@@ -198,7 +197,6 @@ class PembidaController extends Controller
             ->where('lelong_id',$details['lelong_id'])    
             ->distinct()
             ->orderBy('lelong_id')
-            // ->where('cawangan.caw_code','=',$request->kodcaw)
             ->get()
             ->toArray();
             // dd($detailsinfo);

resources/views/account/senarailelongan.blade.php

@@ -15,22 +15,36 @@
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
-                        <th>Cawangan</th>
+                        <th>ID Lelong</th>
                         <th>Tarikh Lelong</th>
+                        <th>Cawangan</th>
+                        <th>Fasa</th>
                         <th>Status Lelong</th>
-                        <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
             <tbody>
-                @foreach($senarai as $data)
+                @foreach($arrayinfo as $data)
                 <tr>
-                    <td>{{$loop->iteration}}</td>
-                    <td>{{ $data->caw_name }}</td>
-                    <td>{{ $data->tarikh_lelong }}</td>
-                    <td>{{ $data->sts_lelong }}</td>
-                    <td>
-                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['lelong_id'], 'caw_code'=>$data['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Pembida"><i class="far fa-edit"></i></a>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $data['detail']['lelong_id']}}</td>
+                    <td>@php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['detail']['tarikh_lelong'] );
+                        $t_lelong =  $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                    @endphp</td>
+                    <td align='left'>
+                        @foreach($data['detailsinfo'] as $details)
+                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                        <span class="m-2">{{ $details['caw_name']}}
+                        </span><br>
+                        @endforeach
                     </td>
+                    <td>{{ $data['detail']['fasa'] }}</td>
+                    <td>
+                        @if($data['detail']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>                 
                 </tr>
                 @endforeach
             </tbody>

resources/views/pembida/senlelpembayaranbidaan.blade.php

@@ -13,7 +13,7 @@
         <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
-                        <th>Bil</th>
+                        <th>No</th>
                         <th>ID Lelong</th>
                         <th>Tarikh Lelong</th>
                         <th>Cawangan</th>
@@ -21,10 +21,6 @@
                         <th>Tempoh</th>
                         <th>Caj Lelong</th>
                         <th>Status Lelong</th>
-<<<<<<< Updated upstream
-=======
-                        <th class="text-center">Tindakan</th>
->>>>>>> Stashed changes
                     </tr>
             </thead>
             <tbody>
@@ -32,7 +28,11 @@
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $lel['detail']['lelong_id']}}</td>
-                    <td>{{ $lel['detail']['tarikh_lelong'] }}</td>
+                    <td>@php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                        $t_lelong =  $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                    @endphp</td>
                     <td align='left'>
                         @foreach($lel['detailsinfo'] as $details)
                         <a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>

routes/web.php

@@ -275,7 +275,7 @@ Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlel
 // Account
 Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'account'], function () {
     Route::get('/senarailelongan', ['as'=>'account.senarailelongan','uses'=>'AccountController@senarailelongan']);
-    Route::get('/listbayaranonline/{lelong_id}/{caw_code}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
+    Route::get('/listbayaranonline/{lelong_id}/{kodcaw}', ['as'=>'account.listbayaranonline','uses'=>'AccountController@listbayaranonline']);
     Route::get('/sahsagonline/{lelong_id}/{user_id}/{caw_code}', ['as'=>'account.sahsagonline','uses'=>'AccountController@sahsagonline']);
     Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
 
@@ -299,10 +299,10 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
 Route::group(['middleware' => ['permission:report'],'prefix'=>'report'], function () { 
 
 Route::get('/lapbrglelongindex',['as'=>'report.lapbrglelongindex','uses'=>'ReportController@lapbrglelongindex']);
-Route::get('/senaraibrglelong/{lelong_id}',['as'=>'report.senaraibrglelong','uses'=>'ReportController@senaraibrglelong']);
+Route::get('/senaraibrglelong/{lelong_id}/{kodcaw}',['as'=>'report.senaraibrglelong','uses'=>'ReportController@senaraibrglelong']);
 
 Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']);
-Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);
+Route::get('/senaraibrglelongdetails/{lelong_id}/{caw_code}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);
 
 Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']);
 Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']);