upah
This commit is contained in:
@@ -1054,8 +1054,9 @@ class GadaiController extends Controller
|
|||||||
$tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$tarikh)->sum('pinjaman');
|
$tebus = Tebus::on($cawangan['mysql'])->where('t_tebus','=',$tarikh)->sum('pinjaman');
|
||||||
$outstanding = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$tarikh],['sttebus','=','']])->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');
|
$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);
|
return response()->json($prestasi_cawangan);
|
||||||
|
|||||||
Reference in New Issue
Block a user