From 4e38b12429385be5332cc14b48cb738099fd59ba Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Tue, 5 Jul 2022 16:38:48 +0800
Subject: [PATCH] fix

---
 app/Http/Controllers/AdminPageController.php | 21 ++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index a22daef..45b1353 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -2299,15 +2299,20 @@ class AdminPageController extends Controller
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         
-        // $gadai = Gadai::on($cawangan['mysql'])
-        // ->where([['sttebus','=',$gadai_status],['nokp','=',$ic],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]])
-        // ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-        // ->get();
-        $lelong = Lelong::on($cawangan['mysql'])
-         ->where([['baki','>',0],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]])
-         ->get();
+        
+        $mula = explode('-', $request->mula);
+        $hingga = explode('-', $request->hingga);
 
-        return response()->json($lelong,200);
+
+        $lelong = Lelong::on($cawangan['mysql'])
+         ->where([['baki','>',0],['trkhtuntut',null]])
+         ->whereMonth('t_lelong','>=',$mula[0])
+         ->whereMonth('t_lelong','<=',$hingga[0])
+         ->whereYear('t_lelong','>=',$mula[1])
+         ->whereYear('t_lelong','<=',$hingga[1])
+         ->get()->toArray();
+
+         return response()->json($lelong,200);
     }
 
     public function InsertDraftWTD(Request $request){