KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 2

Browse Source
This commit is contained in:
Amirah22
2022-06-21 16:27:15 +08:00
parent bfcdcd7474
commit 1e4ee477c1
6 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+17 -11
View File
@@ -796,6 +796,12 @@ class LelongController extends Controller
$total_cajlelong = 0;
$total_bakirugi = 0;
$tarikh_lelong = Lelong::where('id', $lelong_id)
->select('tarikh_lelong')
->groupBy('tarikh_lelong')
->get();
$lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('status_jual', 0)
@@ -805,7 +811,7 @@ class LelongController extends Controller
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.kodcaw',
// 'cawangan.caw_name',
'cawangan.caw_name',
'lelongbid.pinjaman',
'lelongbid.berat',
'lelongbid.nilaimarhun',
@@ -838,7 +844,7 @@ class LelongController extends Controller
$total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki'));
return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id','total_pinjaman',
'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi'));
'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi','tarikh_lelong'));
}
public function pdflelongtaklaku (Request $request){
@@ -1497,13 +1503,13 @@ class LelongController extends Controller
if($count == 1)
{
// $sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id')
// ->where('lelongbidder.user_id','=',$bidder->user_id)
// ->where('lelongbid.lelong_id','=',$lelong_id)
// ->where('lelongbid.caw_id','=',$cawid)
// ->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )
// ->raw("SUM(hargabida) as hargabida")
// ->get();
$sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id')
->where('lelongbidder.user_id','=',$bidder->user_id)
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbid.caw_id','=',$cawid)
->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )
->raw("SUM(hargabida) as hargabida")
->get();
// dd($bidder->user_id);
// dd($bidder->id);
$pemenang = LelongBidder::where('id','=',$bidder->id)->first();
@@ -1546,8 +1552,8 @@ class LelongController extends Controller
$resit->lelong_id = $lelong_id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = 0.00;
//dd($sumhargabida->sum('hargabida'));
$resit->total_payment = $sumhargabida->sum('hargabida');
dd($sumhargabida->sum('hargabida'));
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
app/Http/Controllers/PembidaController.php
+31 -4
View File
@@ -176,12 +176,38 @@ class PembidaController extends Controller
public function senlelpembayaranbidaan(Request $request)
{
$lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
$kodcaw = $request->kodcaw;
$arrayinfo = [];
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->select('lelong_id','tarikh_lelong','fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
->distinct()
->orderBy('lelong_id')
->where('lelong.sts_lelong', 3)
->get();
->get()
->toArray();
foreach($lelong 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')
// ->where('cawangan.caw_code','=',$request->kodcaw)
->get()
->toArray();
// dd($detailsinfo);
array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
}
// dd($request->kodcaw);
return view('pembida.senlelpembayaranbidaan',compact('lelong'));
return view('pembida.senlelpembayaranbidaan',compact('lelong','arrayinfo'));
}
public function pembayaranbidaan(Request $request)
@@ -190,6 +216,7 @@ class PembidaController extends Controller
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $request->lelong_id)
->where('lelongbid.kodcaw', $request->kodcaw)
->select('lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
resources/views/lelong/lelongtaklaku.blade.php
+18 -6
View File
@@ -7,9 +7,23 @@
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<br>
<table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped table-xl">
<thead class="bg-light ">
@foreach ($tarikh_lelong as $tarikh_lelong)
<tr>
<td><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_lelong->tarikh_lelong );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></td>
</tr>
@endforeach
</thead>
</table>
<br>
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -25,7 +39,6 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>Tarikh Lelong</th>
<th>No Rujukan</th>
<th>Nama Cawangan</th>
<th>Bilangan</th>
@@ -33,19 +46,18 @@
<th>Berat (gm)</th>
<th>N. Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Upah Simpan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj (RM)</th>
<th>Rugi (RM)</th>
<th>Baki (RM)</th>
<th>Status Lelong (RM)</th>
<th>Action</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach ($lelongtaklaku as $leltaklaku)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $leltaklaku->t_lelong }}</td>
<td>{{ $leltaklaku->norujukan }}</td>
<td>{{ $leltaklaku->caw_name }}</td>
<td>{{ $leltaklaku['suratlelongtaklaku'] }} </td>
resources/views/pdf/penyatabayaran.blade.php
+1 -1
View File
@@ -52,7 +52,7 @@
</tr>
<tr>
<td>{{$caw['alamat1']}}</td>
{{-- <td align="right">No.Invois: :{{$invois->reference_no}} </td> --}}
<td align="right">No.Invois: :{{$invois['reference_no']}} </td>
</tr>
resources/views/pembida/senlelpembayaranbidaan.blade.php
+20 -13
View File
@@ -14,30 +14,37 @@
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Cawangan</th>
<th>ID Lelong</th>
<th>Tarikh Lelong</th>
<th>Cawangan</th>
<th>Harga Emas Semasa</th>
<th>JBG</th>
<th>cajlelong</th>
<th>Tempoh</th>
<th>Caj Lelong</th>
<th>Status Lelong</th>
<th class="text-center">Action</th>
</tr>
</thead>
<tbody>
@foreach($lelong as $lel)
@foreach($arrayinfo as $lel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $lel->caw_name }}</td>
<td>{{ $lel->tarikh_lelong }}</td>
<td>{{ $lel->harga_emas_asas }}</td>
<td>{{ $lel->jbg }}</td>
<td>{{ $lel->cajlelong }}</td>
<td>{{ $lel['detail']['lelong_id']}}</td>
<td>{{ $lel['detail']['tarikh_lelong'] }}</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>
<span class="m-2">{{ $details['caw_name']}}
</span><br>
@endforeach
</td>
<td>{{ $lel['detail']['harga_emas_asas'] }}</td>
<td>{{ $lel['detail']['jbg'] }}</td>
<td>{{ $lel['detail']['cajlelong'] }}</td>
<td>
@if($lel->sts_lelong == 3)
@if($lel['detail']['sts_lelong'] == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
<td><a href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a></td>
</tr>
@endforeach
</tbody>
@@ -62,7 +69,7 @@
"orderable": false
}
],
order: [[1, 'asc']],
order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
resources/views/pengesahan/senarailelong.blade.php
+1 -1
View File
@@ -16,7 +16,7 @@
<thead class="bg-primary text-white">
<tr>
<th>No</th>
<th>ID Lelong</th>
<th>Lelong ID</th>
<th>Tarikh Lelong</th>
<th>Nama Cawangan</th>
<th>Harga Emas Asas</th>