From fc44f5dee07af9680371b95def63f86b6235b24b Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 22 Apr 2021 09:00:23 +0800 Subject: [PATCH] laporan aktif --- app/Http/Controllers/GadaiController.php | 30 ++++++++++++++---------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index c27bb84..c709384 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2122,27 +2122,33 @@ class GadaiController extends Controller { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - - $arrayrekodemaspalsu = []; - - $rekod_emaspalsu = Gadai::on($cawangan['mysql']) + $rekodaudit = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->get(); - - dd($rekod_emaspalsu); - - $total = Gadai::on($cawangan['mysql']) + $totalrekod = Gadai::on($cawangan['mysql']) ->where('tagpalsu','=',1) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]]) + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) ->sum('pinjaman'); - array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]); + $totalberat = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',1) + ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->sum('berat'); - dd($arrayrekodemaspalsu); - return response()->json(); + $totalnilaimarhun = Gadai::on($cawangan['mysql']) + ->where('tagpalsu','=',1) + ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->sum('nilaimarhun'); + + $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' => $totalnilaimarhun]; + + return response()->json($arrayrekod,200); } }