updated server 28-9-2022

2022-09-27 23:15:44 +08:00
parent a723acca91
commit 9f81fcdac6
4 changed files with 17 additions and 4 deletions
@@ -2946,6 +2946,14 @@ class GadaiController extends Controller
            ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gadai.sttebus','=','T'],['gadai.hargajualan','<>','NULL']])
            ->sum('gadai.pinjaman');

+        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+            ->join('gadai as gad','gad.norujukan','=','lelong.norujukan')
+            ->where('gad.hargajualan','!=',null)
+            ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
+            ->sum('lelong.pinjaman');
+        
+        $Tebus += $pembiayaanlelong;
+
            $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];

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