From 1adc1757f947bf8a11fdc75d755502e473c42866 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Thu, 18 Aug 2022 10:23:52 +0800 Subject: [PATCH] update notis, slipserahan bu user_id --- app/Http/Controllers/NotisController.php | 9 +- app/Http/Controllers/ReportController.php | 88 ++++++++- app/Http/Controllers/SerahanController.php | 1 + .../views/lelong/senaraimarhun.blade.php | 1 + resources/views/pdf/jananotis.blade.php | 3 +- resources/views/pdf/pdflelongreport.blade.php | 184 ++++++++++++++++++ routes/web.php | 3 + 7 files changed, 284 insertions(+), 5 deletions(-) create mode 100644 resources/views/pdf/pdflelongreport.blade.php diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index 2fddd4f6..fb0c1a75 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -138,9 +138,9 @@ class NotisController extends Controller foreach($marhuns as $index1=>$cal){ $customer = Customer::where('kpbaru','=',$cal['nokp']) ->orWhere('kplama','=',$cal['nokp']) - ->join('daerah','customer.koddaerah','=','daerah.koddaerah') - ->join('negeri','customer.kodnegeri','=','negeri.kodnegeri') ->join('poskod','customer.poskod','=','poskod.poskod') + ->join('daerah','poskod.koddaerah','=','daerah.koddaerah') + ->join('negeri','poskod.kodnegeri','=','negeri.kodnegeri') ->first(); $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) @@ -152,11 +152,14 @@ class NotisController extends Controller $bayaran = $listing['hargajualan'] - $listing['bakihargajualan']; } - $marhuns[$index1]['nama'] = $customer; + $marhuns[$index1]['nama'] = ($customer) ? $customer : dd($cal['nokp']); $marhuns[$index1]['listsag'] = $listsag; } + + + // dd($marhuns->toArray()); // $arraycustomer = $gadaicaw2->pluck('nokp')->toArray(); // $datacustomer = $gadaicaw2->get(); // $customer = Customer::query() diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index d88ed0f9..57137d9a 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -655,13 +655,99 @@ class ReportController extends Controller $pdf = PDF::loadView('pdf.pdfsimulasireport',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan','datacaw')) ->setPaper('a4','potrait'); - return $pdf->download('Laporan Barang Lelong Pembida.pdf'); + return $pdf->download('Laporan Simulasi Cawangan.pdf'); } + public function lelongreport ($lelongid, $cawid){ + + $keuntungan = 0; + $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) + ->select( + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.hargajual', + 'lelongbid.t_jual', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.bakiupah', + 'lelongbid.status_jual', + 'lelongbid.jbg' + ) + ->get()->toArray(); + // dd($marhuns); + $arraymarhun = []; + foreach ($marhuns as $index1=> $cal) { + // dd($cal); + $gadai = Gadai::on($cal['kodcaw']) + ->where('norujukan','=',$cal['norujukan']) + ->first(); + // dd($gadai); + $customer = Customer::where('kpbaru','=',$gadai['nokp']) + ->orWhere('kplama','=',$gadai['nokp']) + ->first(); + // dd($customer); + + // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $marhuns[$index1]['keuntungan'] = $keuntungan; + $marhuns[$index1]['nama'] = $customer; + + array_push($arraymarhun,[ + 'norujukan' => $cal['norujukan'], + 'tempoh' => $gadai['tempoh'], + 'nama' => $customer['nama'], + 'berat' => $cal['berat'], + 'nilaimarhun' => $cal['nilaimarhun'], + 'hargaasas' => $cal['hargaasas'], + 'hargajual' => $cal['hargajual'], + 't_jual' => $cal['t_jual'], + 'pinjaman' => $cal['pinjaman'], + 'pinjasal' => $gadai['pinjaman'], + 'bakiupah' => $cal['bakiupah'], + 'cajlelong' => $cal['cajlelong'], + 'baki' => $cal['baki'], + 'upah6bulan' => $gadai['bakiupah'] + ]); + } + + $arrayinfo = []; + + $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelongid) + ->select('lelong_id','tarikh_lelong','lelong.fasa') + ->groupBy('lelong_id') + ->get()->toArray(); + + + foreach($lelong_id as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->where('caw_id',$cawid) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + + $pdf = PDF::loadView('pdf.pdflelongreport',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo')) + ->setPaper('a4','potrait'); + + return $pdf->download('Laporan Lelong Cawangan.pdf'); + + // return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo')); + } + diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php index 049b32d9..b9c6991a 100644 --- a/app/Http/Controllers/SerahanController.php +++ b/app/Http/Controllers/SerahanController.php @@ -188,6 +188,7 @@ class SerahanController extends Controller ->join('lelongbid','lelongbidder.lelongbid_id','=','lelongbid.id') ->select('resit_id','payment.lelong_id','payment.user_id','payment.status','status_payment_opt','lelongbidder.status_payment') ->where('status', 2) + // ->where('payment.user_id',$user_id) ->where('status_payment_opt', 2) ->where('lelongbid.kodcaw',$user->kodcaw) ->orWhere('status_payment_opt', 3) diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 979335ee..cc19e5e2 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -42,6 +42,7 @@ @endif
+ PDF Simulasi Lelong Senarai Mengikut Nama Pelangan diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index 85e4008a..ff291c35 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -124,8 +124,8 @@ page-break-before: always; } - @foreach($marhuns as $index1=> $notis) +{{-- {{dd($notis['nama']['alamat1'])}} --}} @@ -184,6 +184,7 @@ : {{ $notis['nama']['nama']}}
{{ strtoupper($notis['nama']['alamat1']) }} + {{-- {!! ($notis['nama']['alamat1'] === null || $notis['nama']['alamat1'] === '') ? '' : '
' . strtoupper($notis['nama']['alamat1']) !!}
--}} {!! ($notis['nama']['alamat2'] === null || $notis['nama']['alamat2'] === '') ? '' : '
' . strtoupper($notis['nama']['alamat2']) !!}
{{ ' ' . $notis['nama']['poskod'] . ' ' . strtoupper($notis['nama']['namadaerah']) . ' ' . strtoupper($notis['nama']['negeri'])}} diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php new file mode 100644 index 00000000..80b5b900 --- /dev/null +++ b/resources/views/pdf/pdflelongreport.blade.php @@ -0,0 +1,184 @@ + + + + + + + + + + +{{-- @foreach($datacaw as $data) --}} + + +{{-- @endforeach --}} + +

PERMODALAN KELANTAN BERHAD

LAPORAN LELONG CAWANGAN:
+ + {{-- + +
+ + + @foreach ($info as $info) + + + + + @endforeach + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + +
ID Lelong: {{$lelong_id}}Tarikh Lelong: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info->tarikh_lelong ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphpFasa: {{$info->fasa}} Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach + +
--}} + +
+ + + + + + + + + + + + + + + + + + + + + @foreach ($arraymarhun as $index=> $marhun) + + + + + + + + + + + + + + + + + + + @endforeach + + + + {{-- + + + + + + --}} + + + +
NoNo RujukanNama PelangganTempohBerat (gm)Nilai Marhun (RM)Harga Asas (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (%)Rugi Lelong (RM)Baki Lelong (RM)
{{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['nama']}}{{ number_format($marhun['tempoh'], 2, '.', ',') }}{{ number_format($marhun['berat'], 2, '.', ',') }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'], 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{number_format($rugi, 2, '.', ',')}}{{number_format($baki, 2, '.', ',')}}
Jumlah Keseluruhan{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}{{ number_format($total_hargalelong, 2, '.', ',') }}
+ + + + + + + + + diff --git a/routes/web.php b/routes/web.php index 22cc9b7e..6fb642a3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -382,6 +382,9 @@ Route::get('/lelongtebus/{lelong_id}/{kodcaw}',['as'=>'report.lelongtebus','uses Route::get('/simulasireport/{simulasi_id}/{cawid}',['as'=>'report.simulasireport','uses'=>'ReportController@simulasireport']); +Route::get('/lelongreport/{lelongid}/{cawid}',['as'=>'report.lelongreport','uses'=>'ReportController@lelongreport']); + + });