From ad2fe46aaa17496d056bb5ca37a039ce80288ef4 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 2 Aug 2022 07:22:37 +0800 Subject: [PATCH 1/2] fix lejeram --- app/Http/Controllers/GadaiController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c7b403c..2f45597 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2907,8 +2907,10 @@ class GadaiController extends Controller ->sum('teb.pinjaman'); $pembiayaanlelong = Lelong::on($cawangan['mysql']) + ->join('gadai as gad','gad.norujukan','=','lelong.norujukan') + ->where('gad.t_gadai','<=',$tarikhtawarruq) ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]]) - ->sum('pinjaman'); + ->sum('lelong.pinjaman'); $tebus = $tebus + $pembiayaanlelong; From 6836ecad718a7c6088daf8349fdbae3ffcc9afea Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 2 Aug 2022 12:11:54 +0800 Subject: [PATCH 2/2] fix skit --- app/Http/Controllers/AdminPageController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index fad3a04..4abbf8c 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2323,7 +2323,7 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->pluck('norujukan'); + $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan'); $lelong = Lelong::on($cawangan['mysql']) ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki')