add jenis tuntutan

app/Http/Controllers/AdminPageController.php

@@ -3514,6 +3514,7 @@ class AdminPageController extends Controller
                 $sortBy = null;
         }
          
+        if($request->jenistuntut == 'belumtuntut'){
                 $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
                 ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
                 ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
@@ -3527,6 +3528,34 @@ class AdminPageController extends Controller
                         return $query->where('baki','!=','0');
                 })
                 ->get()->toArray();
+        }else if($request->jenistuntut == 'sudahtuntut'){
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->whereNotNull('lelong.trkhtuntut')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }else{
+                $batchleltuntutbaki = Lelong::on($cawangan['mysql'])
+                ->selectRaw('lelong.norujukan,lelong.t_lelong as tarikhlelong,lelong.baki')
+                ->leftJoin('gadai as gad', 'gad.norujukan', '=', 'lelong.norujukan')
+                ->where([['lelong.t_lelong','>=',$request->mula],['lelong.t_lelong','<=',$request->hingga]])
+                ->whereNotNull('gad.upah12')
+                ->whereNotNull('lelong.hargajual')
+                ->when($sortBy, function ($query) use ($sortBy) {
+                        return $query->where('baki',$sortBy,'0');
+                }, function ($query) {
+                        return $query->where('baki','!=','0');
+                })
+                ->get()->toArray();
+        }
         
         return response()->json($batchleltuntutbaki);
     }