From 68d471d365a53a89380df85a5995b45eb6a50a1f Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 21 Jun 2022 08:28:07 +0800 Subject: [PATCH] update 21062022 --- app/Http/Controllers/LelongController.php | 18 +++++++++--------- .../Controllers/TangguhLelongController.php | 5 ++++- resources/views/lelong/showlelong.blade.php | 2 +- .../pengesahan/senaraitangguhlelong.blade.php | 6 ++++-- .../senarailelongtangguh.blade.php | 10 +++++----- .../tangguhlelong/senleltangguh.blade.php | 2 +- .../views/tangguhlelong/sensahpc.blade.php | 15 ++++++++++----- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5a728eba..dac5f08d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1477,13 +1477,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(); @@ -1526,8 +1526,8 @@ class LelongController extends Controller $resit->lelong_id = $lelong_id; $resit->reference_no = $reference_no; $resit->billplz_id = ''; - $resit->total_payment = $sumhargabida->sum('hargabida'); - dd($sumhargabida->sum('hargabida')); + $resit->total_payment = 0.00; + //dd($sumhargabida->sum('hargabida')); $resit->resit_type = 2; // 1 = fee , 2 = bid $resit->save(); } diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 7ebb86f2..4650b426 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -285,18 +285,21 @@ class TangguhLelongController extends Controller ->whereNull('pengesahan.disahkan_pada') ->whereNull('tangguhlelong.tarikhtangguh') ->get(); + // dd($pengesahan); foreach($pengesahan as $index1=>$sah) { $lelongbid = LelongBid::where('id', $sah->lelongbid_id) ->where('norujukan', $sah->norujukan) - ->where('kodcaw', $caw_code) + // ->where('kodcaw', $caw_code) ->get(); + // dd($sah->norujukan); $pengesahan[$index1]['bid_details'] = $lelongbid; $pengesahan[$index1]['nota'] = $sah->nota; } + // dd($pengesahan); return view('tangguhlelong.sensahpc', compact('pengesahan', 'lelong_id' , 'caw_code')); } diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index d8977268..9468a203 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -369,7 +369,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], // "ordering": false, "searching":false, "info": false, diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 2124586d..7c5da803 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -18,8 +18,9 @@ Bil Tarikh Tangguh + ID Lelong No Rujukan - Remark + Nota Action @@ -28,8 +29,9 @@ {{ $loop->iteration }} {{ $tangguhlel->tarikhtangguh }} + {{ $tangguhlel->lelong_id }} {{ $tangguhlel->norujukan }} - {{ $tangguhlel->nota }} + {{ $tangguhlel->nota }} diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index 2d04439e..c57f96d2 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -19,12 +19,12 @@ Lelong ID Tarikh Lelong - Cawangan + Harga Emas Asas - JBG + Tempoh Caj Lelong Status Lelong - Action + Tindakan @@ -38,11 +38,11 @@ $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp - + {{$lel['info']['harga_emas_asas']}} {{$lel['info']['jbg']}} {{$lel['info']['cajlelong']}} diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index 4b768ecb..0c47b3e9 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -20,7 +20,7 @@ Tarikh Lelong Cawangan Harga Emas Asas - JBG + Tempoh Caj Lelong Status Lelong Action diff --git a/resources/views/tangguhlelong/sensahpc.blade.php b/resources/views/tangguhlelong/sensahpc.blade.php index bc56f492..bcb96fd0 100644 --- a/resources/views/tangguhlelong/sensahpc.blade.php +++ b/resources/views/tangguhlelong/sensahpc.blade.php @@ -21,13 +21,13 @@ No Tarikh Lelong No Rujukan - JBG + Tempoh Marhun - Nilai Marhun (RM) + N.Marhun (RM) Pembiayaan (RM) Berat - Remark - Action + Nota + Tindakan @@ -36,7 +36,12 @@ @foreach ($pengesahan as $sah) {{$loop->iteration}} - {{$sah['bid_details'][0]['t_lelong']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $sah['bid_details'][0]['t_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + {{$sah['norujukan']}} {{$sah['bid_details'][0]['jbg']}} {{$sah['bid_details'][0]['marhun']}}