From 8df2183d8f1d843fbaa43770c1f42f7aa20f27df Mon Sep 17 00:00:00 2001 From: Afiq Date: Fri, 8 Jan 2021 22:00:54 +0800 Subject: [PATCH] upah --- app/Http/Controllers/GadaiController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 2041946..72a0fab 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1054,8 +1054,9 @@ class GadaiController extends Controller $tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$tarikh)->sum('pinjaman'); $outstanding = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$tarikh],['sttebus','=','']])->sum('pinjaman'); $nilaiMarhun = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$tarikh],['sttebus','=','']])->sum('nilaimarhun'); + $upah = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$tarikh)->sum('bakiupah'); - array_push($prestasi_cawangan,['cawangan'=>$cawangan['details_caw'],'nilai_marhun'=>$nilaiMarhun,'outstanding'=>$outstanding,'gadai'=>$gadai,'tebus'=>$tebus,'tarikh'=>$tarikh]); + array_push($prestasi_cawangan,['cawangan'=>$cawangan['details_caw'],'nilai_marhun'=>$nilaiMarhun,'outstanding'=>$outstanding,'gadai'=>$gadai,'tebus'=>$tebus,'upah'=>$upah,'tarikh'=>$tarikh]); } return response()->json($prestasi_cawangan);