Merge branch 'adminapi' into 'master'

Adminapi

See merge request online-sistem1/api_arrahn!153

app/Http/Controllers/AdminPageController.php

@@ -2323,7 +2323,7 @@ class AdminPageController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-        $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->pluck('norujukan');
+        $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->where('kodcaw','=',$request->kodcaw)->pluck('norujukan');
 
         $lelong = Lelong::on($cawangan['mysql'])
         ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki')

app/Http/Controllers/GadaiController.php

@@ -2907,8 +2907,10 @@ class GadaiController extends Controller
             ->sum('teb.pinjaman');
 
        $pembiayaanlelong = Lelong::on($cawangan['mysql'])
+            ->join('gadai as gad','gad.norujukan','=','lelong.norujukan')
+            ->where('gad.t_gadai','<=',$tarikhtawarruq)
             ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]])
-            ->sum('pinjaman');
+            ->sum('lelong.pinjaman');
 
         $tebus = $tebus + $pembiayaanlelong;