diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index c3c3ec89..b0c37542 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -24,6 +24,7 @@ class PaymentController extends Controller $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 3) ->get(); // dd($senarai); diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index df679cc5..ccbb0934 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -6,11 +6,15 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; -use App\Models\User; -use App\Models\File; use PDF; use Carbon\Carbon; +use App\Models\User; +use App\Models\File; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use App\Models\LelongBidder; +use App\Models\Payment; class PembidaController extends Controller { @@ -168,6 +172,85 @@ class PembidaController extends Controller return redirect()->route('pembida.senaraipembidakeseluruhan')->with('success','Pembida Berjaya Dikemaskini'); } + + public function senlelpembayaranbidaan(Request $request) + { + $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('lelong.sts_lelong', 3) + ->get(); + + return view('pembida.senlelpembayaranbidaan',compact('lelong')); + } + + public function pembayaranbidaan(Request $request) + { + // dd($request->all()); + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('lelongbidder.user_id' + ) + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); + + 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', $request->lelong_id) + ->get(); + + $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('lelongbidder.status_payment') + ->get(); + + $detailspayment = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id') + ->where('payment.kodcaw', $request->kodcaw) + ->where('payment.lelong_id', $request->lelong_id) + ->whereNotNull('payment.disahkan_pada') + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbidder.status_payment', 1) + ->get(); + + $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $request->lelong_id) + ->select('payment_id')->groupBy('payment_id')->get(); + + $total_payment = 0; + foreach($payment_id as $id){ + $payment = Payment::where('id', $id->payment_id) + ->first(); + + if($payment){ + $total_payment = $total_payment + $payment->total_payment; + } + } + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['totalPay'] = $total_payment; + $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; + $listwinner[$index1]['status'] = $detailspayment[0]['status']; + $listwinner[$index1]['remark'] = $detailspayment[0]['remark']; + + } + + return view('pembida.pembayaranbidaan',compact('listwinner')); + } + + public function detailsbidaan(Request $request) + { + + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 2d2d3455..56c92cb8 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -151,6 +151,9 @@
  • Senarai Pembida
    • +
  • + Pembayaran Bidaan +
    • @endhasrole diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php new file mode 100644 index 00000000..08119024 --- /dev/null +++ b/resources/views/pembida/pembayaranbidaan.blade.php @@ -0,0 +1,118 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + + + @foreach($listwinner as $winner) + + + + + + + + + + + + @endforeach + +
    BilNama PembidaNo Kad PengenalanBilangan Surat Jumlah Bidaan (RM) Amaun Telah Dibayar (RM)Status PembayaranRemarkStatusAction
    {{ $loop->iteration }}{{ $winner['details']['name'] }}{{ $winner['details']['nokp'] }}{{ $winner['total_surat'] }}{{ $winner['totalBid'] }}{{ $winner['totalPay'] }} + @if($winner['status'] == 1) + + @elseif($winner['status'] == 2) + + @endif + + @if($winner['sts_payment'] == 1) + + @else + @endif + +
    +
    + Kembali +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php new file mode 100644 index 00000000..721cfcf7 --- /dev/null +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -0,0 +1,104 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + + + + + @foreach($lelong as $lel) + + + + + + + + + + + @endforeach + +
    BilCawanganTarikh LelongHarga Emas SemasaJBGcajlelongStatus LelongAction
    {{ $loop->iteration }}{{ $lel->caw_name }}{{ $lel->tarikh_lelong }}{{ $lel->harga_emas_asas }}{{ $lel->jbg }}{{ $lel->cajlelong }} + @if($lel->sts_lelong == 3) + + @endif +
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 5abad53f..ed5c4cd6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -164,6 +164,8 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::post('/reject',['as'=>'pembida.reject','uses'=>'PembidaController@reject']); Route::get('/kemaskini/{id}',['as'=>'pembida.kemaskini','uses'=>'PembidaController@kemaskini']); Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']); + Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); + Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () {