From a8bb735263af16b95a56fe3293e71d8f0e276997 Mon Sep 17 00:00:00 2001 From: Amir Date: Sun, 19 Feb 2023 09:55:40 +0800 Subject: [PATCH] Fix status pembayaran by cawangan operasi and akaun --- app/Http/Controllers/PembidaController.php | 63 ++++++ app/Models/LelongBidder.php | 5 + app/Models/Payment.php | 5 + app/Models/User.php | 5 + resources/views/includes/sidebar.blade.php | 2 +- .../pembayaran/kaunterpembayaran.blade.php | 4 +- .../views/pembida/statuspembayaran.blade.php | 2 +- .../views/pembida/statuspembayaran2.blade.php | 197 ++++++++++++++++++ .../statuspembayaranbypembida.blade.php | 20 +- .../views/template/reset-password.blade.php | 4 +- routes/web.php | 4 +- 11 files changed, 294 insertions(+), 17 deletions(-) create mode 100644 resources/views/pembida/statuspembayaran2.blade.php diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 89a497bf..bc175336 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -915,6 +915,69 @@ class PembidaController extends Controller return view('pembida.statuspembayaran',compact('arraysms','arraysls','listwinner','lelong','arrayinfo','detailsinfo')); } + public function statuspembayaran2() + { + $current_date = Carbon::now(); + $current_date = $current_date->toDateString(); + + $lelong_all = Lelong::with( + 'cawangan:id,caw_code,caw_name', + 'lelongBidJual:lelong_id,id,norujukan,caw_id,kodcaw', + 'lelongBidJual.lelongBidderMenang:lelongbid_id,user_id,nama_bidder,hargabida,status_payment', + 'lelongBidJual.lelongBidderMenang.payment:lelongbid_id,user_id,status_payment_opt', + 'lelongBidJual.lelongBidderMenang.payment.user:id,name', + )->select('id', 'tarikh_lelong')->where('sts_lelong', 3)->get(); + + $lelong_array = []; + foreach ($lelong_all as $lelong) { + $allCawangan = $lelong->cawangan->keyBy('caw_code'); + $lelongBid = $lelong->lelongBidJual->groupBy('kodcaw'); + + foreach ($lelongBid as $index => $lelong_bid) { + foreach ($allCawangan as $data => $cawangan) { + if ($data == $index) { + $cawangan['lelongBid'] = $lelong_bid; + } + } + } + $cawangan_array = []; + foreach ($lelong->cawangan as $caw) { + $users = $caw->lelongBid->pluck('lelongBidderMenang')->groupBy('user_id'); + $jumlah_bidaan_cawangan = $caw->lelongBid->pluck('lelongBidderMenang')->sum('hargabida'); + $user_array = []; + foreach ($users as $user) { + $user_to_be_added = []; + $user_to_be_added['name_bidder'] = $user[0]->nama_bidder; + $user_to_be_added['jumlah_bidaan'] = $user->sum('hargabida'); + $user_to_be_added['status_bayaran'] = $user[0]->status_payment; + $user_to_be_added['jenis_bayaran'] = $user[0]->payment->status_payment_opt; + array_push($user_array, $user_to_be_added); + } + $cawangan_to_be_added = []; + $cawangan_to_be_added['caw_code'] = $caw->caw_code; + $cawangan_to_be_added['caw_name'] = $caw->caw_name; + $cawangan_to_be_added['pembida'] = $user_array; + $cawangan_to_be_added['jumlah_bidaan_cawangan'] = $jumlah_bidaan_cawangan; + array_push($cawangan_array, $cawangan_to_be_added); + } + $lelong_to_be_added = []; + $lelong_to_be_added['lelong_id'] = $lelong->id; + $lelong_to_be_added['tarikh_lelong'] = $lelong->tarikh_lelong; + $lelong_to_be_added['cawangan'] = $cawangan_array; + array_push($lelong_array, $lelong_to_be_added); + } + $lelong_array_semasa = []; + $lelong_array_selesai = []; + foreach ($lelong_array as $lelong) { + if ($lelong['tarikh_lelong'] == $current_date) { + array_push($lelong_array_semasa, $lelong); + } else { + array_push($lelong_array_selesai, $lelong); + } + } + return view('pembida.statuspembayaran2', compact('lelong_array_semasa', 'lelong_array_selesai')); + } + public function statuspembayaranbypembida(Request $request) { $kodcaw = $request->kodcaw; diff --git a/app/Models/LelongBidder.php b/app/Models/LelongBidder.php index 6d8ae91f..cf200b45 100644 --- a/app/Models/LelongBidder.php +++ b/app/Models/LelongBidder.php @@ -27,4 +27,9 @@ class LelongBidder extends Model public function lelongbid() { return $this->hasOne(LelongBid::class,'id', 'lelongbid_id'); } + + public function payment() + { + return $this->hasOne(Payment::class, 'lelongbid_id', 'lelongbid_id'); + } } diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 51d781f8..d4ff26ee 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -41,4 +41,9 @@ class Payment extends Model 'disahkan_pada', 'disahkan_oleh' ]; + + public function user() + { + return $this->belongsTo(User::class, 'user_id', 'id'); + } } diff --git a/app/Models/User.php b/app/Models/User.php index b6cf6a5c..1124527d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -73,4 +73,9 @@ class User extends Authenticatable return $this->hasOne(Cawangan::class, 'caw_code' , 'kodcaw'); } + public function payment() + { + return $this->hasMany(Payment::class, 'user_id', 'id'); + } + } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index f98d6c38..d8756c24 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -808,7 +808,7 @@ -
  • is('account/statuspembayaran/*') || request()->is('account/statuspembayaran') ) ? 'active' : '' }}"> +
  • diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index c2f6c836..6e97edc6 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -37,8 +37,8 @@ Jumlah Bidaan(RM) Amaun Telah Dibayar(RM) Status Bayaran - Penyata Bayaran - Slip Serahan + Penyata Pemenang + Slip Serahan Marhun {{-- Resit Pembayaran --}} Tindakan diff --git a/resources/views/pembida/statuspembayaran.blade.php b/resources/views/pembida/statuspembayaran.blade.php index 28eaec6b..8b12ec62 100644 --- a/resources/views/pembida/statuspembayaran.blade.php +++ b/resources/views/pembida/statuspembayaran.blade.php @@ -8,7 +8,7 @@
    - Senarai Status Pembayaran + Status Pembayaran (Mengikut Cawangan)
    diff --git a/resources/views/pembida/statuspembayaran2.blade.php b/resources/views/pembida/statuspembayaran2.blade.php new file mode 100644 index 00000000..e4f4025a --- /dev/null +++ b/resources/views/pembida/statuspembayaran2.blade.php @@ -0,0 +1,197 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    +
    + Status Pembayaran (Mengikut Cawangan) +
    +
    +
    + @hasrole('operasi') + Status Pembayaran Mengikut Nama Pembida + @endhasrole + @hasrole('account') + Status Pembayaran Mengikut Nama Pembida + @endhasrole + +
    +
    + @if($lelong_array_semasa != null) + + + + + + + + + + + @foreach($lelong_array_semasa as $lelong) + + + + + + + @endforeach + +
    NoBatch LelongTarikh LelongCawangan
    {{ $loop->iteration }}{{ $lelong['lelong_id'] }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + + @foreach($lelong['cawangan'] as $cawangan) +
    @hasrole('operasi')@endhasrole{{ $cawangan['caw_name'] }}
    + + + + + + + + + + + + @foreach($cawangan['pembida'] as $pembida) + + + + + + + + @endforeach + + + + + +
    NoPembidaJumlah BidaanStatus BayaranJenis Bayaran
    {{ $loop->iteration }}{{ $pembida['name_bidder'] }}{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}} + @if($pembida['status_bayaran'] == 1) + + @elseif($pembida['status_bayaran'] == 2) + + @else + + @endif + + @if($pembida['jenis_bayaran'] == 1) + TUNAI + @elseif($pembida['jenis_bayaran'] == 2) + FPX + @else + CDM + @endif +
    JUMLAH KESELURUHAN{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}
    + @endforeach +
    + @endif +
    +
    + @if($lelong_array_selesai != null) + + + + + + + + + + + @foreach($lelong_array_selesai as $lelong) + + + + + + + @endforeach + +
    NoBatch LelongTarikh LelongCawangan
    {{ $loop->iteration }}{{ $lelong['lelong_id'] }} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + + @foreach($lelong['cawangan'] as $cawangan) +
    @hasrole('operasi')@endhasrole{{ $cawangan['caw_name'] }}
    + + + + + + + + + + + + @foreach($cawangan['pembida'] as $pembida) + + + + + + + + @endforeach + + + + + +
    NoPembidaJumlah BidaanStatus BayaranJenis Bayaran
    {{ $loop->iteration }}{{ $pembida['name_bidder'] }}{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}} + @if($pembida['status_bayaran'] == 1) + + @elseif($pembida['status_bayaran'] == 2) + + @else + + @endif + + @if($pembida['jenis_bayaran'] == 1) + TUNAI + @elseif($pembida['jenis_bayaran'] == 2) + FPX + @else + CDM + @endif +
    JUMLAH KESELURUHAN{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}
    + @endforeach +
    + @endif +
    +
    +
    +
    +
    +
    +
    + + +@endsection \ No newline at end of file diff --git a/resources/views/pembida/statuspembayaranbypembida.blade.php b/resources/views/pembida/statuspembayaranbypembida.blade.php index f6231898..8a187dd7 100644 --- a/resources/views/pembida/statuspembayaranbypembida.blade.php +++ b/resources/views/pembida/statuspembayaranbypembida.blade.php @@ -7,8 +7,18 @@
    + @hasrole('operasi') + + + + @endhasrole + @hasrole('account') + + + + @endhasrole
    - Senarai Status Pembayaran + Status Pembayaran (Mengikut Nama)
    @@ -18,14 +28,6 @@
    @endif
    - {{-- Muat Turun PDF --}} - @hasrole('operasi') - Status Pembayaran Mengikut Cawangan - @endhasrole - @hasrole('account') - Status Pembayaran Mengikut Cawangan - @endhasrole -
    diff --git a/resources/views/template/reset-password.blade.php b/resources/views/template/reset-password.blade.php index cfdb8d8d..9703c412 100644 --- a/resources/views/template/reset-password.blade.php +++ b/resources/views/template/reset-password.blade.php @@ -40,7 +40,7 @@ style="width:600px;border-collapse:collapse;border:1px solid #cccccc;border-spacing:0;text-align:left;"> @@ -68,7 +68,7 @@

    Terima Kasih,

    - Sistem Lelong Online

    + ArrahnBid

    - Sistem Lelong Online + ArrahnBid
    diff --git a/routes/web.php b/routes/web.php index 0fccfd38..82235a80 100644 --- a/routes/web.php +++ b/routes/web.php @@ -333,7 +333,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/SAGBidItembycaw/{user_id}/{lelong_id}/{kodcaw}', ['as'=>'pembida.SAGBidItembycaw','uses'=>'PembidaController@SAGBidItembycaw']); Route::post('/benarkantunai', ['as'=>'pembida.benarkantunai','uses'=>'PembidaController@benarkantunai']); Route::get('/kaunterpembayaran/{lelong_id}/{kodcaw}', ['as'=>'pembida.kaunterpembayaran','uses'=>'PembidaController@SenaraiPemenang']); - Route::get('/statuspembayaran',['as'=>'pembida.statuspembayaran','uses'=>'PembidaController@statuspembayaran']); + Route::get('/statuspembayaran',['as'=>'pembida.statuspembayaran','uses'=>'PembidaController@statuspembayaran2']); Route::get('/statuspembayaranbypembida',['as'=>'pembida.statuspembayaranbypembida','uses'=>'PembidaController@statuspembayaranbypembida']); Route::get('/statusserahanbidaan',['as'=>'pembida.statusserahanbidaan','uses'=>'PembidaController@statusserahanbidaan']); Route::get('/statusserahanbypembida',['as'=>'pembida.statusserahanbypembida','uses'=>'PembidaController@statusserahanbypembida']); @@ -450,7 +450,7 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']); Route::get('/listbayaranonlinehome', ['as'=>'account.listbayaranonlinehome','uses'=>'AccountController@listbayaranonlinehome']); Route::get('/listpengesahanakaun/{lelong_id}/{kodcaw}',['as'=>'account.listpengesahanakaun','uses'=>'AccountController@listpengesahanakaun']); - Route::get('/statuspembayaran',['as'=>'account.statuspembayaran','uses'=>'PembidaController@statuspembayaran']); + Route::get('/statuspembayaran',['as'=>'account.statuspembayaran','uses'=>'PembidaController@statuspembayaran2']); Route::get('/statuspembayaranbypembida',['as'=>'account.statuspembayaranbypembida','uses'=>'PembidaController@statuspembayaranbypembida']); Route::get('/sahsagcdm/{lelong_id}/{user_id}/{caw_code}', ['as'=>'account.sahsagcdm','uses'=>'AccountController@sahsagcdm']); Route::get('/showphotoresit',['as'=>'account.showphotoresit','uses'=>'AccountController@showPhotoResit']);