Fix status pembayaran by cawangan operasi and akaun
This commit is contained in:
Amir
@@ -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;
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,4 +41,9 @@ class Payment extends Model
|
||||
'disahkan_pada',
|
||||
'disahkan_oleh'
|
||||
];
|
||||
|
||||
public function user()
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id', 'id');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -808,7 +808,7 @@
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
<li {{ (request()->is('account/statuspembayaran/*') || request()->is('account/statuspembayaran') ) ? 'active' : '' }}">
|
||||
<li class="{{ (request()->is('account/statuspembayaran')) ? 'active' : '' }}">
|
||||
<a href="{{url('account/statuspembayaran')}}">
|
||||
<div class="sidebar-menu-main-title">
|
||||
<span class="material-symbols-rounded sidebar-menu-item-main">
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
<th>Jumlah Bidaan(RM)</th>
|
||||
<th>Amaun Telah Dibayar(RM)</th>
|
||||
<th>Status Bayaran</th>
|
||||
<th>Penyata Bayaran</th>
|
||||
<th>Slip Serahan</th>
|
||||
<th>Penyata Pemenang</th>
|
||||
<th>Slip Serahan Marhun</th>
|
||||
{{-- <th>Resit Pembayaran</th> --}}
|
||||
<th class="text-center">Tindakan</th>
|
||||
</tr>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="card">
|
||||
<div class="card-header header-style">
|
||||
<div class="header-style-title">
|
||||
Senarai Status Pembayaran
|
||||
Status Pembayaran (Mengikut Cawangan)
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
|
||||
@@ -0,0 +1,197 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col">
|
||||
<div class="card">
|
||||
<div class="card-header header-style">
|
||||
<div class="header-style-title">
|
||||
Status Pembayaran (Mengikut Cawangan)
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@hasrole('operasi')
|
||||
<a href="{{ route('pembida.statuspembayaranbypembida') }}" class="btn btn-success mb-2">Status Pembayaran Mengikut Nama Pembida</a>
|
||||
@endhasrole
|
||||
@hasrole('account')
|
||||
<a href="{{ route('account.statuspembayaranbypembida') }}" class="btn btn-success mb-2">Status Pembayaran Mengikut Nama Pembida</a>
|
||||
@endhasrole
|
||||
<ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
|
||||
Lelongan Semasa
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" id="selesai-lelong-tab" data-toggle="tab" href="#selesai-lelong" role="tab" aria-controls="selesai-lelong" aria-selected="false">
|
||||
Lelongan Selesai
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content" style="overflow-x: auto;" id="myTabContent">
|
||||
<div class="tab-pane fade show active" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-lelong-tab">
|
||||
@if($lelong_array_semasa != null)
|
||||
<table class="table table-bordered" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th class="text-center">No</th>
|
||||
<th class="text-center">Batch Lelong</th>
|
||||
<th class="text-center">Tarikh Lelong</th>
|
||||
<th>Cawangan</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($lelong_array_semasa as $lelong)
|
||||
<tr>
|
||||
<td class="text-center">{{ $loop->iteration }}</td>
|
||||
<td class="text-center">{{ $lelong['lelong_id'] }}</td>
|
||||
<td class="text-center text-nowrap">
|
||||
@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] );
|
||||
$t_lelong = $myDateTime->format('d-m-Y');
|
||||
echo($t_lelong);
|
||||
@endphp
|
||||
</td>
|
||||
<td>
|
||||
@foreach($lelong['cawangan'] as $cawangan)
|
||||
<div class="mb-1">@hasrole('operasi')<a class="btn btn-primary btn-sm mr-1" href="{{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lelong['lelong_id'], 'kodcaw'=>$cawangan['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran"><i class="far fa-edit"></i></a>@endhasrole{{ $cawangan['caw_name'] }}</div>
|
||||
<table class="table table-bordered mb-5" width="10">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th class="text-centere">No</th>
|
||||
<th style="min-width: 200px;">Pembida</th>
|
||||
<th class="text-right" style="min-width: 125px;">Jumlah Bidaan</th>
|
||||
<th class="text-center">Status Bayaran</th>
|
||||
<th class="text-center">Jenis Bayaran</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($cawangan['pembida'] as $pembida)
|
||||
<tr>
|
||||
<td class="text-center">{{ $loop->iteration }}</td>
|
||||
<td class="text-uppercase">{{ $pembida['name_bidder'] }}</td>
|
||||
<td class="text-right">{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}}</td>
|
||||
<td class="text-center">
|
||||
@if($pembida['status_bayaran'] == 1)
|
||||
<button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
|
||||
@elseif($pembida['status_bayaran'] == 2)
|
||||
<button class="btn btn-sm btn-warning" disabled>Tungguh Pengesahan</button>
|
||||
@else
|
||||
<button class="btn btn-sm btn-danger" disabled>Belum Bayar</button>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($pembida['jenis_bayaran'] == 1)
|
||||
<span class="badge badge-pill badge-dark">TUNAI</span>
|
||||
@elseif($pembida['jenis_bayaran'] == 2)
|
||||
<span class="badge badge-pill badge-primary">FPX</span>
|
||||
@else
|
||||
<span class="badge badge-pill badge-secondary">CDM</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td class="text-center" colspan="2">JUMLAH KESELURUHAN</td>
|
||||
<td class="text-right">{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@endforeach
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
</div>
|
||||
<div class="tab-pane fade" id="selesai-lelong" role="tabpanel" aria-labelledby="selesai-lelong-tab">
|
||||
@if($lelong_array_selesai != null)
|
||||
<table class="table table-bordered" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th class="text-center">No</th>
|
||||
<th class="text-center">Batch Lelong</th>
|
||||
<th class="text-center">Tarikh Lelong</th>
|
||||
<th>Cawangan</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($lelong_array_selesai as $lelong)
|
||||
<tr>
|
||||
<td class="text-center">{{ $loop->iteration }}</td>
|
||||
<td class="text-center">{{ $lelong['lelong_id'] }}</td>
|
||||
<td class="text-center text-nowrap">
|
||||
@php
|
||||
$myDateTime = DateTime::createFromFormat('Y-m-d', $lelong['tarikh_lelong'] );
|
||||
$t_lelong = $myDateTime->format('d-m-Y');
|
||||
echo($t_lelong);
|
||||
@endphp
|
||||
</td>
|
||||
<td>
|
||||
@foreach($lelong['cawangan'] as $cawangan)
|
||||
<div class="mb-1">@hasrole('operasi')<a class="btn btn-primary btn-sm mr-1" href="{{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lelong['lelong_id'], 'kodcaw'=>$cawangan['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Butiran"><i class="far fa-edit"></i></a>@endhasrole{{ $cawangan['caw_name'] }}</div>
|
||||
<table class="table table-bordered mb-5" width="10">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th class="text-centere">No</th>
|
||||
<th style="min-width: 200px;">Pembida</th>
|
||||
<th class="text-right" style="min-width: 125px;">Jumlah Bidaan</th>
|
||||
<th class="text-center">Status Bayaran</th>
|
||||
<th class="text-center">Jenis Bayaran</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($cawangan['pembida'] as $pembida)
|
||||
<tr>
|
||||
<td class="text-center">{{ $loop->iteration }}</td>
|
||||
<td class="text-uppercase">{{ $pembida['name_bidder'] }}</td>
|
||||
<td class="text-right">{{ number_format($pembida['jumlah_bidaan'], 2, '.', ',')}}</td>
|
||||
<td class="text-center">
|
||||
@if($pembida['status_bayaran'] == 1)
|
||||
<button class="btn btn-sm btn-success" disabled>Selesai Bayar</button>
|
||||
@elseif($pembida['status_bayaran'] == 2)
|
||||
<button class="btn btn-sm btn-warning" disabled>Tungguh Pengesahan</button>
|
||||
@else
|
||||
<button class="btn btn-sm btn-danger" disabled>Belum Bayar</button>
|
||||
@endif
|
||||
</td>
|
||||
<td class="text-center">
|
||||
@if($pembida['jenis_bayaran'] == 1)
|
||||
<span class="badge badge-pill badge-dark">TUNAI</span>
|
||||
@elseif($pembida['jenis_bayaran'] == 2)
|
||||
<span class="badge badge-pill badge-primary">FPX</span>
|
||||
@else
|
||||
<span class="badge badge-pill badge-secondary">CDM</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
<tr>
|
||||
<td class="text-center" colspan="2">JUMLAH KESELURUHAN</td>
|
||||
<td class="text-right">{{ number_format($cawangan['jumlah_bidaan_cawangan'], 2, '.', ',')}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@endforeach
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(function() {
|
||||
$('[data-toggle="tooltip"]').tooltip()
|
||||
});
|
||||
</script>
|
||||
@endsection
|
||||
@@ -7,8 +7,18 @@
|
||||
<div class="col">
|
||||
<div class="card">
|
||||
<div class="card-header header-style">
|
||||
@hasrole('operasi')
|
||||
<a href="{{ route('pembida.statuspembayaran') }}" class="header-style-icon">
|
||||
<i class="fas fa-arrow-left"></i>
|
||||
</a>
|
||||
@endhasrole
|
||||
@hasrole('account')
|
||||
<a href="{{ route('account.statuspembayaran') }}" class="header-style-icon">
|
||||
<i class="fas fa-arrow-left"></i>
|
||||
</a>
|
||||
@endhasrole
|
||||
<div class="header-style-title">
|
||||
Senarai Status Pembayaran
|
||||
Status Pembayaran (Mengikut Nama)
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@@ -18,14 +28,6 @@
|
||||
</div>
|
||||
@endif
|
||||
<div class="mb-3">
|
||||
{{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
|
||||
@hasrole('operasi')
|
||||
<a href="{{ route('pembida.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
|
||||
@endhasrole
|
||||
@hasrole('account')
|
||||
<a href="{{ route('account.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
|
||||
@endhasrole
|
||||
|
||||
</div>
|
||||
<table class="table table-bordered table-xl text-center" id="senarailelongonline" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
style="width:600px;border-collapse:collapse;border:1px solid #cccccc;border-spacing:0;text-align:left;">
|
||||
<tr style="border-collapse:collapse;border:1px solid #cccccc;border-spacing:0;">
|
||||
<td align="left" style="padding:10px 25px;background:#fff; display: flex; align-items: center;">
|
||||
<span style="font-weight: bold; padding-top: 10px;"> Sistem Lelong Online </span>
|
||||
<span style="font-weight: bold; padding-top: 10px;"> ArrahnBid</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -68,7 +68,7 @@
|
||||
<p style="margin:100px 0 12px 0;font-size:14px;font-family:Arial,sans-serif;">
|
||||
Terima Kasih, </p>
|
||||
<p style="margin:0 0 12px 0;font-size:14px;font-family:Arial,sans-serif;">
|
||||
Sistem Lelong Online </p>
|
||||
ArrahnBid</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
+2
-2
@@ -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']);
|
||||
|
||||
Reference in New Issue
Block a user