From 35d108629e9ea2af54742ff724ec4611905e5ea4 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 22 Mar 2023 09:28:36 +0800 Subject: [PATCH] update laporan lelong --- app/Http/Controllers/ReportCawanganController.php | 4 ++-- resources/views/pdf/laporanlelfullcaw.blade.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 722bbeb2..341b1239 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -329,7 +329,7 @@ class ReportCawanganController extends Controller ->where('lelongbid.lelong_id','=',$lelong_id) ->where('lelongbid.kodcaw','=',$user['kodcaw']) ->where('lelongbidder.status_bidder','=','1') - ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', + ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah', 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') ->get()->toArray(); @@ -339,7 +339,7 @@ class ReportCawanganController extends Controller $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; - $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; + $total_upahsimpan = $total_upahsimpan + $laplelong['bakiupah']; $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; $total_bakirugi = $total_bakirugi + $laplelong['baki']; diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php index bd02ec94..d11af9ad 100644 --- a/resources/views/pdf/laporanlelfullcaw.blade.php +++ b/resources/views/pdf/laporanlelfullcaw.blade.php @@ -180,7 +180,7 @@ tr:nth-child(even) { {{ number_format($laporan['nilaimarhun'], 2, '.', ',')}} {{ number_format($laporan['pinjaman'], 2, '.', ',')}} {{ number_format($laporan['margin'], 2, '.', ',')}} - {{ number_format($laporan['upahsimpan'], 2, '.', ',')}} + {{ number_format($laporan['bakiupah'], 2, '.', ',')}} {{ number_format($laporan['cajlelong'], 2, '.', ',')}} {{ number_format($laporan['hargabida'], 2, '.', ',')}}