Merge branch 'apiaku' into 'master'

fix lejer v1 See merge request online-sistem1/api_arrahn!130
2021-11-07 08:15:14 +00:00
parent 9d95f13414 67e95902bd
commit 0800744517
1 changed files with 6 additions and 0 deletions
@@ -2728,6 +2728,12 @@ class GadaiController extends Controller
            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
            ->sum('teb.pinjaman');

+       $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+            ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
+            ->sum('pinjaman');
+
+        $tebus = $tebus + $pembiayaanlelong;
+
        $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];

        return response()->json($array_rekodemas);