From 05622858d5ecae50c8e66d6719de1cb1a9799e1a Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Thu, 8 Jul 2021 16:54:05 +0800 Subject: [PATCH] fix laporan --- app/Http/Controllers/LaporanController.php | 18 ++++++++++++++++++ app/Http/Controllers/VaultController.php | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 053a8c2..53b42ff 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -193,14 +193,20 @@ class LaporanController extends Controller $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman'); $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->sum('nilaimarhun'); $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','<=',70]])->count(); $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',70],['percentpinj','<=',75]])->count(); $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$request->tarikh],['percentpinj','>',75],['percentpinj','<=',80]])->count(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_harian,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -214,12 +220,15 @@ class LaporanController extends Controller 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'panjar_harian'=>$panjar_harian, 'panjar_bulanan'=>$panjar_bulanan, 'panjar_tahunan'=>$panjar_tahunan, @@ -317,14 +326,20 @@ class LaporanController extends Controller $gadai_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('pinjaman'); $gadai_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('pinjaman'); + $total_gadaian = floatval($gadai_70) + floatval($gadai_75) + floatval($gadai_80); + $nilaimarhun_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->sum('nilaimarhun'); $nilaimarhun_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->sum('nilaimarhun'); $nilaimarhun_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->sum('nilaimarhun'); + $total_nm = floatval($nilaimarhun_70) + floatval($nilaimarhun_75) + floatval($nilaimarhun_80); + $bilangan_70 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','<=',70]])->count(); $bilangan_75 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',70],['percentpinj','<=',75]])->count(); $bilangan_80 = Gadai::on($cawangan['mysql'])->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->akhir],['percentpinj','>',75],['percentpinj','<=',80]])->count(); + $total_bilangan = floatval($bilangan_70) + floatval($bilangan_75) + floatval($bilangan_80); + array_push($laporan_terkumpul,[ 'total_gadai'=>$total_gadai, 'total_tebus'=>$total_tebus, @@ -338,12 +353,15 @@ class LaporanController extends Controller 'gadai_70'=>$gadai_70, 'gadai_75'=>$gadai_75, 'gadai_80'=>$gadai_80, + 'total_gadaian'=>$total_gadaian, 'nilaimarhun_70'=>$nilaimarhun_70, 'nilaimarhun_75'=>$nilaimarhun_75, 'nilaimarhun_80'=>$nilaimarhun_80, + 'total_nm'=>$total_nm, 'bilangan_70'=>$bilangan_70, 'bilangan_75'=>$bilangan_75, 'bilangan_80'=>$bilangan_80, + 'total_bilangan'=>$total_bilangan, 'bilangan_lelong'=>$bilangan_lelong, 'cas_lelong'=>$cas_lelong, 'jumlah_lelong'=>$jumlah_lelong, diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index f223515..7686890 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -105,7 +105,7 @@ class VaultController extends Controller $serahan = $vault['serahan']; $totpanjaran = $vault['totpanjar']; - $totalpanjar = $request->totpanjar - $totpanjaran; + $totalpanjar = $totpanjaran - $request->totpanjar; $bakiakhir = $bakiawal - $keluar + $masuk + $pendahuluan - $serahan - $totalpanjar;