From 1e4ee477c1d7789ae7056e3f846ed1f33e4aebd0 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 21 Jun 2022 16:27:15 +0800 Subject: [PATCH] update 2 --- app/Http/Controllers/LelongController.php | 28 +++++++++------ app/Http/Controllers/PembidaController.php | 35 ++++++++++++++++--- .../views/lelong/lelongtaklaku.blade.php | 24 +++++++++---- resources/views/pdf/penyatabayaran.blade.php | 2 +- .../pembida/senlelpembayaranbidaan.blade.php | 33 ++++++++++------- .../views/pengesahan/senarailelong.blade.php | 2 +- 6 files changed, 88 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index dd88fa97..e3d73789 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -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(); } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 46909cf5..ebf0affa 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -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') diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index de2f6de7..f12f9caa 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -7,9 +7,23 @@ -
+ + + @foreach ($tarikh_lelong as $tarikh_lelong) + + + + + + @endforeach + + +
Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_lelong->tarikh_lelong ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphp
-
@if ($message = Session::get('success'))

{{ $message }}

@@ -25,7 +39,6 @@ No - Tarikh Lelong No Rujukan Nama Cawangan Bilangan @@ -33,19 +46,18 @@ Berat (gm) N. Marhun (RM) Harga Asas (RM) - Upah Simpan (RM) + Keuntungan (RM) Caj (RM) Rugi (RM) Baki (RM) Status Lelong (RM) - Action + Tindakan @foreach ($lelongtaklaku as $leltaklaku) {{ $loop->iteration }} - {{ $leltaklaku->t_lelong }} {{ $leltaklaku->norujukan }} {{ $leltaklaku->caw_name }} {{ $leltaklaku['suratlelongtaklaku'] }} diff --git a/resources/views/pdf/penyatabayaran.blade.php b/resources/views/pdf/penyatabayaran.blade.php index d9f77fc5..3c669d31 100644 --- a/resources/views/pdf/penyatabayaran.blade.php +++ b/resources/views/pdf/penyatabayaran.blade.php @@ -52,7 +52,7 @@ {{$caw['alamat1']}} - {{-- No.Invois: :{{$invois->reference_no}} --}} + No.Invois: :{{$invois['reference_no']}} diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php index 721cfcf7..ef6e1807 100644 --- a/resources/views/pembida/senlelpembayaranbidaan.blade.php +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -14,30 +14,37 @@ Bil - Cawangan + ID Lelong Tarikh Lelong + Cawangan Harga Emas Semasa - JBG - cajlelong + Tempoh + Caj Lelong Status Lelong - Action - @foreach($lelong as $lel) + @foreach($arrayinfo as $lel) {{ $loop->iteration }} - {{ $lel->caw_name }} - {{ $lel->tarikh_lelong }} - {{ $lel->harga_emas_asas }} - {{ $lel->jbg }} - {{ $lel->cajlelong }} + {{ $lel['detail']['lelong_id']}} + {{ $lel['detail']['tarikh_lelong'] }} + + @foreach($lel['detailsinfo'] as $details) + + {{ $details['caw_name']}} +
+ @endforeach + + {{ $lel['detail']['harga_emas_asas'] }} + {{ $lel['detail']['jbg'] }} + {{ $lel['detail']['cajlelong'] }} - @if($lel->sts_lelong == 3) + @if($lel['detail']['sts_lelong'] == 3) @endif - + @endforeach @@ -62,7 +69,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], "info": false, "lengthChange": false, "pageLength": 15, diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index 5233ade6..c6e03ed8 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -16,7 +16,7 @@ No - ID Lelong + Lelong ID Tarikh Lelong Nama Cawangan Harga Emas Asas