From 3a2128cff7a5d94446ca99ec541bbdb933c129ea Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 8 Nov 2022 09:53:47 +0800 Subject: [PATCH] update report using relation, fix error jana notis 30 hari --- .../Controllers/ReportCawanganController.php | 1 - app/Http/Controllers/ReportController.php | 52 +++---------------- app/Http/Controllers/TamatKontController.php | 24 +++++++-- app/Models/Cawangan.php | 5 ++ .../views/excel/gadaibycawexcel.blade.php | 45 +++++++++++----- resources/views/pdf/listlelong.blade.php | 8 +-- 6 files changed, 70 insertions(+), 65 deletions(-) diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 846a66f2..0a9024ac 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -81,7 +81,6 @@ class ReportCawanganController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbid.kodcaw','=',$user['kodcaw']) ->get()->toArray(); - // dd($brglelongcaw); $keuntungan=0; $total_hargaasas = 0; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 01367392..976dfbb4 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -89,23 +89,12 @@ class ReportController extends Controller $arrayinfo = []; - $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->where('cawangan.caw_code', $kodcaw) - ->select('lelong_id','tarikh_lelong','lelong.fasa') - ->groupBy('lelong_id') - ->get()->toArray(); + $test = Lelong::with(['cawangan','lelongBid']) + ->find($lelong_id); - foreach($lelongid as $laporan) - { - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->where('cawangan.caw_code', $kodcaw) - ->get() - ->toArray(); - array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); - } + $cawangan = $test->cawangan; + $lelong_bid = $test->lelongBid; + $keuntungan=0; @@ -113,39 +102,14 @@ class ReportController extends Controller $total_berat = 0; - $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') - ->where('lelong_id','=',$lelong_id) - ->where('lelongbid.kodcaw', $kodcaw); - $arraynorujukan = $marhun->pluck('norujukan')->toArray(); - $datasimulasi = $marhun->get(); - - foreach($datasimulasi as $index=>$totharga){ + $total_hargaasas = $lelong_bid->sum('hargaasas'); + $total_berat = $lelong_bid->sum('berat'); - $total_hargaasas = $total_hargaasas + $totharga['hargaasas']; - $total_berat = $total_berat + $totharga['berat']; - - } - - - $marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) - ->get()->toArray(); - // dd($marhuns); - - foreach($marhuns as $index1=>$upah) - { - $listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan) - ->where('nokp','=',$upah['nokp']) - ->get(); - - - } - $marhuns[$index1]['listsag'] = $listsag; - $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','marhuns','lelong_id','keuntungan','total_hargaasas', - 'total_berat','datasimulasi')) + $pdf = PDF::loadView('pdf.listlelong',compact('cawangan','lelong_bid','total_hargaasas','total_berat')) ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Barang Lelong.pdf'); diff --git a/app/Http/Controllers/TamatKontController.php b/app/Http/Controllers/TamatKontController.php index 11e58aa5..d84dcbd3 100644 --- a/app/Http/Controllers/TamatKontController.php +++ b/app/Http/Controllers/TamatKontController.php @@ -31,6 +31,8 @@ use App\Models\CawanganLelong; use App\Models\LelongBid; use App\Models\LelongBidMarhun; use App\Models\LelKarat; +use App\Models\Customer; + use DateTime; @@ -282,15 +284,28 @@ class TamatKontController extends Controller foreach($getsurat as $index1=>$surats) { - $senarai = Gadai::on($user->kodcaw) - // join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + + $customer = Customer::where('kpbaru','=',$surats['nokp']) + ->orWhere('kplama','=',$surats['nokp']) + ->get(); + + $listsag = Gadai::on($user->kodcaw) ->where('norujukan', $surats['norujukan']) ->get(); $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; + + // foreach($listsag as $index=>$listing){ + + // $bayaran = $listing['hargajualan'] - $listing['bakihargajualan']; + + // } + + // $ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan']; + - $getsurat[$index1]['list_norujukan'] = $senarai; + $getsurat[$index1]['nama'] = $customer; $getsurat[$index1]['ktlhbyr'] = $ktlhbyr; } @@ -303,7 +318,8 @@ class TamatKontController extends Controller 't_gadais', 't_anggaran', 'bil_lelongcaw', - 'ktlhbyr')); + 'ktlhbyr' + )); diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php index 3ebb860a..f7d5227a 100644 --- a/app/Models/Cawangan.php +++ b/app/Models/Cawangan.php @@ -61,4 +61,9 @@ class Cawangan extends Model return $this->hasMany(LelongBid::class, 'caw_id', 'id'); } + // public function lelong() + // { + // return $this->belongsToMany(Lelong::class, 'cawangan_lelong', 'caw_id', 'lelong_id'); + // } + } diff --git a/resources/views/excel/gadaibycawexcel.blade.php b/resources/views/excel/gadaibycawexcel.blade.php index 3d018d1e..97e2e04f 100644 --- a/resources/views/excel/gadaibycawexcel.blade.php +++ b/resources/views/excel/gadaibycawexcel.blade.php @@ -46,6 +46,7 @@ Bil No Rujukan No Kad Pengenalan + No Telefon Tempoh Berat (gm) Pembiayaan (RM) @@ -54,22 +55,42 @@ Keuntungan Telah Bayar (RM) - @foreach($getsurat as $surat) + @foreach($getsurat as $index1=> $notis) + {{ $loop->iteration }} - {{ $surat['list_norujukan'][0]['norujukan'] }} - {{ $surat['list_norujukan'][0]['nokp'] }} - {{ $surat['list_norujukan'][0]['tempoh'] }} - {{ $surat['list_norujukan'][0]['berat'] }} - {{ $surat['list_norujukan'][0]['pinjaman'] }} - {{ $surat['list_norujukan'][0]['bakipjm'] }} - {{ $surat['list_norujukan'][0]['bakiupah'] }} + {{ $notis['norujukan'] }} + {{ $notis['nokp'] }} + 6{{ $notis['nama'][0]['telefon'] }} + {{ $notis['tempoh'] }} + {{ $notis['berat'] }} + {{ $notis['pinjaman'] }} + {{ $notis['bakipjm'] }} + {{ $notis['bakiupah'] }} + + {{ number_format($notis['ktlhbyr'] , 2, '.', ',')}} - {{ number_format($surat['ktlhbyr'] , 2, '.', ',')}} + @endforeach - - - @endforeach + {{-- @foreach($getsurat as $surat) + + {{ $loop->iteration }} + {{ $surat['list_norujukan'][0]['norujukan'] }} + {{ $surat['list_norujukan'][0]['nokp'] }} + 60{{ $surat['list_norujukan'][0]['telefon'] }} + {{ $surat['list_norujukan'][0]['tempoh'] }} + {{ $surat['list_norujukan'][0]['berat'] }} + {{ $surat['list_norujukan'][0]['pinjaman'] }} + {{ $surat['list_norujukan'][0]['bakipjm'] }} + {{ $surat['list_norujukan'][0]['bakiupah'] }} + + {{ number_format($surat['ktlhbyr'] , 2, '.', ',')}} + + + +@endforeach --}} + + diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index 24afe23d..0b59be50 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -86,7 +86,7 @@ tr:nth-child(even) { - + {{--

@@ -105,7 +105,7 @@ tr:nth-child(even) { @endforeach -
+ --}}
@@ -121,14 +121,14 @@ tr:nth-child(even) { - @foreach ($marhuns as $index=> $details) + @foreach ($lelong_bid as $index=> $details) {{ $loop->iteration }} {{ $details['norujukan']}} {{ $details['marhun']}} {{ number_format($details['berat'], 2, '.', ',') }} - {{ $datasimulasi[$index]['hargaasas'] }} + {{ number_format($details['hargaasas'], 2, '.', ',') }} @endforeach