diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php index d9a6e091..5b40b032 100644 --- a/app/Http/Controllers/ReportAllController.php +++ b/app/Http/Controllers/ReportAllController.php @@ -78,82 +78,6 @@ class ReportAllController extends Controller return view('lelongall.laporanlelongall', compact('lelong','arrayinfo')); } - public function senaraibrglelongall(Request $request, $kali){ - - - $kali = $kali; - $lelong = Lelong::where('kali','=',$kali)->first(); - // dd($lelong); - - $cawanganlel = CawanganLelong::where('kali','=',$kali)->get(); - // dd($cawanganlel); - - - $arraycaw = []; - - $total_marhun = 0; - $total_berat = 0; - $total_hargaasas = 0; - - - foreach($cawanganlel as $cawlel) - { - $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - //$brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id') - $brglel = LelongBid:: join('cawangan_lelong', function ($join) { - $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id') - ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id'); - }) - ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas') - ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id) - ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id) - ->where('cawangan_lelong.kali','=',$kali) - ->get(); - // dd($cawlel); - - $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id) - ->where('cawangan_lelong.kali','=',$kali)->first(); - - $packet = 0; - $berat = 0; - $hargaasas = 0; - $id = $cawlel->lelong_id; - - foreach($brglel as $index1=>$bid) - { - - $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); - $berat = $berat + $bid['berat']; - $hargaasas = $hargaasas + $bid['hargaasas']; - - - } - - array_push($arraycaw,[ - 'id_cawangan'=> $cawangan['id'], - 'cawangan'=>$cawangan['caw_name'], - 't_lelong'=>$t_lelong['tarikh_lelong'], - 'bil_marhun'=>sizeof($brglel), - 'berat'=>$berat, - 'hargaasas'=>$hargaasas, - - ]); - - $total_marhun = $total_marhun + sizeof($brglel); - $total_berat = $total_berat + $berat; - $total_hargaasas = $total_hargaasas + $hargaasas; - - } - - $pdf = PDF::loadView('pdf.listlelongall',compact('arraycaw', - 'total_marhun', - 'total_berat', - 'total_hargaasas', - 'kali'))->setPaper('a4', 'potrait'); - - return $pdf->download('Senarai Barang Lelong All.pdf'); - } public function lapbidaanpembidaindexall (){ @@ -273,7 +197,7 @@ class ReportAllController extends Controller 'data', 'kali'))->setPaper('a4', 'potrait'); - return $pdf->download('Senarai Barang Lelong All.pdf'); + return $pdf->download('Senarai Lelong Pembida By Batch.pdf'); @@ -329,13 +253,17 @@ class ReportAllController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id') - ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + $databid = LelongBid::join('cawangan_lelong', function ($join) { + $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id') + ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id'); + }) + //->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun', 'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah') - ->where('lelongbidder.status_bidder','=','1') + //->where('lelongbidder.status_bidder','=','1') ->where('cawangan_lelong.caw_id','=', $cawlel->caw_id) ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id) + ->where('cawangan_lelong.kali','=',$kali) ->get(); $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') @@ -541,14 +469,87 @@ class ReportAllController extends Controller ->setPaper('a4','potrait'); return $pdf->download('Laporan Barang Lelong Pembida.pdf'); - - - } - + public function senaraibrglelongall(Request $request, $kali){ + + + $kali = $kali; + $lelong = Lelong::where('kali','=',$kali)->first(); + // dd($lelong); + + $cawanganlel = CawanganLelong::where('kali','=',$kali)->get(); + // dd($cawanganlel); + + + $arraycaw = []; + + $total_marhun = 0; + $total_berat = 0; + $total_hargaasas = 0; + + + foreach($cawanganlel as $cawlel) + { + $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); + //$brglel = LelongBid::join('cawangan_lelong','cawangan_lelong.caw_id','=','lelongbid.caw_id') + $brglel = LelongBid:: join('cawangan_lelong', function ($join) { + $join->on('cawangan_lelong.caw_id', '=', 'lelongbid.caw_id') + ->on('cawangan_lelong.lelong_id', '=', 'lelongbid.lelong_id'); + }) + ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.hargaasas') + ->where('cawangan_lelong.caw_id','=',$cawlel->caw_id) + ->where('cawangan_lelong.lelong_id','=',$cawlel->lelong_id) + ->where('cawangan_lelong.kali','=',$kali) + ->get(); + // dd($cawlel); + + $t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('cawangan_lelong.lelong_id','=', $cawlel->lelong_id) + ->where('cawangan_lelong.kali','=',$kali)->first(); + + $packet = 0; + $berat = 0; + $hargaasas = 0; + $id = $cawlel->lelong_id; + + + foreach($brglel as $index1=>$bid) + { + + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); + $berat = $berat + $bid['berat']; + $hargaasas = $hargaasas + $bid['hargaasas']; + + + } + + array_push($arraycaw,[ + 'id_cawangan'=> $cawangan['id'], + 'cawangan'=>$cawangan['caw_name'], + 't_lelong'=>$t_lelong['tarikh_lelong'], + 'bil_marhun'=>sizeof($brglel), + 'berat'=>$berat, + 'hargaasas'=>$hargaasas, + + ]); + + $total_marhun = $total_marhun + sizeof($brglel); + $total_berat = $total_berat + $berat; + $total_hargaasas = $total_hargaasas + $hargaasas; + + } + + $pdf = PDF::loadView('pdf.listlelongall',compact('arraycaw', + 'total_marhun', + 'total_berat', + 'total_hargaasas', + 'kali'))->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong All.pdf'); + } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index e3d522bc..102215d8 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -144,8 +144,6 @@ class ReportController extends Controller return view('lelong.brgleldetails', compact('arraydetails')); } - - public function senaraibrglelongdetails ($lelong_id, $kodcaw){ $lelongs= LelongBid::where('lelong_id','=',$lelong_id) @@ -1013,51 +1011,6 @@ class ReportController extends Controller return view('marhun.ubahmarhun', compact('cawangan','lelong_id','getpengesahan')); } - public function lapubahmarhunlelongindexpdf ($lelong_id, $kodcaw, $t_lelong){ - - $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id) - ->where('pengesahan.status', 1) - ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%') - ->whereNotNull('pengesahan.disahkan_oleh') - ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id') - ->orderBy('pengesahan.lelongbid_id') - ->distinct() - ->get(); - - foreach($cawangan as $index1=>$caw) - { - - $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first(); - - $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first(); - $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); - - $status = Pengesahan::where('lelongbid_id', $caw['lelongbid_id']) - ->select('id as sahid','status_ubah', 'request_karat', 'request_berat', 'request_marhun') - ->get(); - - - $marhuns = LelongBidMarhun::where('lelongbid_id', $caw['lelongbid_id']) - ->get() - ->toArray(); - $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; - $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; - $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; - $cawangan[$index1]['detailmarhun']=$status; - $cawangan[$index1]['detail']=$marhuns; - } - - $getpengesahan = Cawangan::where('caw_code', $kodcaw)->first(); - - - // return view('pdf.laporanubahmarhun', compact('cawangan','lelong_id','getpengesahan','t_lelong')); - - $pdf = PDF::loadView('pdf.laporanubahmarhun',compact('cawangan','lelong_id','getpengesahan','t_lelong')) - ->setPaper('a4', 'potrait'); - - return $pdf->download('Senarai Ubah Marhun.pdf'); - } - public function exportubahmarhun (){ $arraydetails = []; @@ -1218,7 +1171,10 @@ class ReportController extends Controller $arraydetails = []; $total_berat = 0; $total_hargaasas = 0; - + + $t_mula = $request->datemula; + $t_hingga = $request->datehingga; + $cawangan_id = $request->caw; if($request->datemula == null){ @@ -1235,30 +1191,38 @@ class ReportController extends Controller $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - $cawangan = Cawangan::where('cawangan.id',$cawangan_id) - ->join('cawangan_lelong','cawangan.id','=','cawangan_lelong.caw_id') - ->join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw') - ->where([['tarikh_lelong','>=',$request->datemula],['tarikh_lelong','<=',$request->datehingga]]) - ->select('norujukan','marhun','berat','hargaasas','cawangan_lelong.lelong_id','lelongbid.id','cawangan.caw_code') - ->get()->toArray(); + // $cawangan = Cawangan::join('cawangan_lelong','cawangan_lelong.caw_id','=','cawangan.id') + // ->join('lelong','lelong.id','=','cawangan_lelong.lelong_id') + // ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw') + // ->where('lelong.tarikh_lelong','>=',$t_mula) + // ->where('lelong.tarikh_lelong','<=',$t_hingga) + // ->where('cawangan_lelong.caw_id',$cawangan_id) + // ->select('cawangan.id','cawangan_lelong.lelong_id','cawangan.caw_code','lelongbid.norujukan','lelongbid.marhun','lelongbid.berat','lelongbid.hargaasas','lelong.tarikh_lelong','lelongbid.lelong_id') + // ->get()->toArray(); + $namacaw = Cawangan::where('id',$cawangan_id) + ->select('caw_name') + ->get(); + + $cawangan = LelongBid::join('lelong','lelong.id','=','lelongbid.lelong_id') + ->where('lelong.tarikh_lelong','>=',$t_mula) + ->where('lelong.tarikh_lelong','<=',$t_hingga) + ->where('lelongbid.caw_id',$cawangan_id) + ->select('lelongbid.lelong_id','lelongbid.norujukan','lelongbid.marhun','lelongbid.berat','lelongbid.hargaasas','lelong.tarikh_lelong') + ->get()->toArray(); + //dd($cawangan); foreach($cawangan as $index1=>$brglelong){ - $data = LelongBid::where('id','=',$brglelong['id']) - ->where('kodcaw','=',$brglelong['caw_code']) - ->get(); - $total_berat = $total_berat + ($data->sum('berat')); - $total_hargaasas = $total_hargaasas + ($data->sum('hargaasas')); - - + // $data = LelongBid::where('id','=',$brglelong['id']) + // ->where('kodcaw','=',$brglelong['caw_code']) + // ->select('norujukan','marhun','berat','hargaasas','id') + // ->get(); + $total_berat = $total_berat + $brglelong['berat']; + $total_hargaasas = $total_hargaasas + $brglelong['hargaasas']; } - // dd($total_berat); - - - return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas')); + return view('pdf.cetakbdbrglelong',compact('cawangan','total_berat','total_hargaasas','namacaw','t_mula','t_hingga')); } diff --git a/resources/views/pdf/cetakbdbrglelong.blade.php b/resources/views/pdf/cetakbdbrglelong.blade.php index 6a3323c1..9c8eca40 100644 --- a/resources/views/pdf/cetakbdbrglelong.blade.php +++ b/resources/views/pdf/cetakbdbrglelong.blade.php @@ -89,21 +89,19 @@ tr:nth-child(even) {
- {{-- - @foreach ($arrayinfo as $laporan) - - - - - @foreach ($laporan['details'] as $details) - + @foreach ($namacaw as $item) + @endforeach - --}} + + @php + $tarikh_mula = date('d-m-Y', strtotime($t_mula)); + $tarikh_hingga = date('d-m-Y', strtotime($t_hingga)); + @endphp + + +
Batch Lelong : {{$laporan['laporan']['lelong_id']}}Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); - $t_lelong = $myDateTime->format('d-m-Y'); - echo($t_lelong); - @endphpFasa : {{$laporan['laporan']['fasa']}}Cawangan : {{$details['caw_name']}} - @endforeach + +
Cawangan : {{$item->caw_name}}
Tarikh Lelong : {{ $tarikh_mula }} Hingga {{ $tarikh_hingga }}
@@ -114,6 +112,8 @@ tr:nth-child(even) { No + Lelong ID + Tarikh Lelong No Rujukan Marhun Berat (gm) @@ -124,16 +124,20 @@ tr:nth-child(even) { @foreach ($cawangan as $item) {{ $loop->iteration }} - + {{ $item['lelong_id'] }} + @php + $t_lelong = date('d-m-Y', strtotime($item['tarikh_lelong'])); + @endphp + {{ $t_lelong }} {{ $item['norujukan'] }} - {{ $item['marhun'] }} - {{ $item['berat'] }} - {{ $item['hargaasas'] }} + {{ $item['marhun'] }} + {{ $item['berat'] }} + {{ $item['hargaasas'] }} @endforeach - Jumlah Keseluruhan + Jumlah Keseluruhan {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} diff --git a/resources/views/pdf/simulasireportbycust.blade.php b/resources/views/pdf/simulasireportbycust.blade.php index 9a852c13..87b7fcee 100644 --- a/resources/views/pdf/simulasireportbycust.blade.php +++ b/resources/views/pdf/simulasireportbycust.blade.php @@ -75,8 +75,8 @@ tr:nth-child(even) { /** Define now the real margins of every page in the PDF **/ body { margin-top: 1cm; - /* margin-left: 2cm; */ - /* margin-right: 2cm; */ + /*margin-left: 0cm; + margin-right: 1cm; */ margin-bottom: 2cm; } @@ -134,7 +134,7 @@ tr:nth-child(even) { Tempoh Berat(gm) Nilai Marhun (RM) - Pembiayaan Asal (RM) + Baki Pembiayaan (RM) Keuntungan 6 Bulan (RM) Keuntungan Telah Bayar (RM) @@ -146,7 +146,7 @@ tr:nth-child(even) { @foreach ($marhuns as $index=> $marhun) {{$loop->iteration}} - {{ $marhun['nama']['nama']}} + {{ $marhun['nama']['nama']}} {{ $marhun['nokp']}} @foreach ($marhun['listsag'] as $item) {{-- {{$loop->iteration}}.{{ $item['norujukan'] }}
--}} @@ -176,7 +176,7 @@ tr:nth-child(even) { {{ number_format($jumnilaimarhun, 2, '.', ',') }} - + @php $jumpinjaman = 0;@endphp @foreach ($marhun['listsag'] as $item) diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php index d56219b9..d1e18e16 100644 --- a/resources/views/simulasi/listsagbycust.blade.php +++ b/resources/views/simulasi/listsagbycust.blade.php @@ -39,7 +39,7 @@ Tempoh Berat Asal(gm) Nilai Marhun Asal(RM) - Pembiayaan Asal (RM) + Baki Pembiayaan (RM) Keuntungan 6 Bulan (RM) Keuntungan Telah Bayar (RM) @@ -86,7 +86,7 @@ {{ number_format($jumnilaimarhun, 2, '.', ',') }} - + @php $jumpinjaman = 0;@endphp @foreach ($marhun['listsag'] as $item)