From 157d1ded952e52536523ed0bbd8bbbb6bfb25837 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 19 Jul 2022 10:36:49 +0800 Subject: [PATCH] update perubahan mutu marhun join marhun cawangan --- app/Http/Controllers/MarhunController.php | 35 ++++++++++++++----- app/Http/Controllers/ReportController.php | 18 +++++++--- .../views/jananotis/kemaskininotis.blade.php | 2 +- resources/views/pdf/listlelong.blade.php | 16 ++++----- .../views/pdf/pdfsenarailapbidaan.blade.php | 8 +++++ .../views/pengesahan/mutumarhun.blade.php | 7 ++-- 6 files changed, 59 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 50e151db..48ed25b3 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -674,7 +674,26 @@ class MarhunController extends Controller // 'gadaimarhun.id as idgadaimarhun' ) ->get(); - // dd($lelbidmarhuns); + + + + $arraygadai = $lelbidmarhuns->pluck('norujukan')->toArray(); + $datagadai = $lelbidmarhuns; + + + $gadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) + ->get()->toArray(); + + foreach($gadai as $index1=>$gadai2) + { + + $listgadai = GadaiMarhun::on($datagadai[0]['kodcaw'])->whereIn('norujukan', $arraygadai) + ->get(); + + } + $gadai[$index1]['listgadai'] = $listgadai; + // dd($gadai); + $arraylelbidmarhun = []; $bakilelong = 0; @@ -685,11 +704,11 @@ class MarhunController extends Controller ->where('id', $lelbidmarhun->lelongbidmarhun_id) ->get()->toArray(); - $marhunsgadai = GadaiMarhun::where('norujukan', $norujukan) - // ->where('karat', $lelbidmarhun->karat) - // ->where('id', $lelbidmarhun->idgadaimarhun) - ->first(); - // dd($lelbidmarhun->idgadaimarhun); + // $marhunsgadai = GadaiMarhun::where('norujukan', $norujukan) + // // ->where('karat', $lelbidmarhun->karat) + // // ->where('id', $lelbidmarhun->idgadaimarhun) + // ->first(); + // // dd($lelbidmarhun->idgadaimarhun); $lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id) ->where('lelongbid.lelong_id', $id) @@ -724,7 +743,7 @@ class MarhunController extends Controller $rugilelong = $totalbaki; } - $marhuns[$index1]['harga_gadai'] = $marhunsgadai['harga']; + // $marhuns[$index1]['harga_gadai'] = $marhunsgadai['harga']; $marhuns[$index1]['nmarhun_gadai'] = $marhun['old_nmarhun']; $marhuns[$index1]['old_marhun'] = $marhun['marhun']; $marhuns[$index1]['status_ubah'] = $status; @@ -738,7 +757,7 @@ class MarhunController extends Controller } - return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns')); + return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraylelbidmarhun', 'marhuns','gadai')); } public function terimaperubahan(Request $request) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 7da1732f..b88c1a3f 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -277,6 +277,8 @@ class ReportController extends Controller $arraydetails = []; $arrayinfocaw = []; + $total_hargaasas = 0; + $total_hargabida = 0; $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') @@ -304,9 +306,13 @@ class ReportController extends Controller ->groupBy('lelongbid_id') ->get() ->toArray(); - + foreach( $laporanpembida as $index1=>$totlappembida){ + $total_hargaasas = $total_hargaasas + $totlappembida['hargaasas']; + // $total_hargabida = $total_hargabida + $totlappembida['hargabida']; + + } foreach($laporanpembida as $laporan) { $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) @@ -317,7 +323,10 @@ class ReportController extends Controller array_push($arraydetails,['laporan' => $laporan,'details' => $details]); } - $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw')) + + + + $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida')) ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); @@ -453,7 +462,7 @@ class ReportController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan.caw_code',$kodcaw) ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->select('lelong_id','tarikh_lelong','fasa') + ->select('lelong_id','tarikh_lelong','lelong.fasa') ->groupBy('lelong_id') ->get(); @@ -469,8 +478,7 @@ class ReportController extends Controller - $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + $brglelpembida = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->where('lelongbid.kodcaw',$kodcaw) ->where('lelongbid.lelong_id','=',$lelong_id) ->where('lelongbidder.status_bidder','=','1') diff --git a/resources/views/jananotis/kemaskininotis.blade.php b/resources/views/jananotis/kemaskininotis.blade.php index d68f88a9..746cc85c 100644 --- a/resources/views/jananotis/kemaskininotis.blade.php +++ b/resources/views/jananotis/kemaskininotis.blade.php @@ -24,7 +24,7 @@
+
diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index 2fcdc38a..24afe23d 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -96,7 +96,7 @@ tr:nth-child(even) { $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); - @endphp + @endphp Fasa : {{$laporan['laporan']['fasa']}} @foreach ($laporan['details'] as $details) @@ -119,9 +119,7 @@ tr:nth-child(even) { Berat (gm) Harga Asas - - - + @foreach ($marhuns as $index=> $details) @@ -130,12 +128,10 @@ tr:nth-child(even) { {{ $details['norujukan']}} {{ $details['marhun']}} {{ number_format($details['berat'], 2, '.', ',') }} - - {{ $datasimulasi[$index]['hargaasas'] }} - - - @endforeach - + {{ $datasimulasi[$index]['hargaasas'] }} + + + @endforeach JUMLAH KESELURUHAN diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php index 06e37379..beede57b 100644 --- a/resources/views/pdf/pdfsenarailapbidaan.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -148,6 +148,14 @@ tr:nth-child(even) { @endforeach + + + Jumlah Keseluruhan + {{ number_format($total_hargaasas, 2, '.', ',') }} + + + + diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 03d173b8..33d29832 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -66,9 +66,10 @@ @endif {{ $detail[0]['berat'] }} - + {{-- {{ number_format($detail[0]['harga_gadai'], 2, '.', ',') }} - + --}} + {{ number_format ($gadai[$index1]['harga'], 2, '.', ',') }} @if($detail[0]['old_harga'] != $detail[0]['harga']) {{ number_format($detail[0]['old_harga'], 2, '.', ',') }} @@ -203,7 +204,7 @@ "orderable": true } ], - order: [[1, 'asc']], + order: [[0, 'asc']], // "ordering": false, "info": false, "lengthChange": false,