fix gadai

app/Http/Controllers/GadaiController.php

@@ -190,8 +190,8 @@ class GadaiController extends Controller
 
     public function daftarGadaiMarhun($norujukan,Request $request)
     {
-        $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //panjar
-
+        $current = Carbon::now();
+        $current = new Carbon();
 
         $t_matang = Carbon::now();
         $t_matang = new Carbon();
@@ -1922,18 +1922,17 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
-            ->where('t_gadai','<=',$request->tarikh)
-            ->where('sttebus','=','')
             ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-            ->where('t_gadai','<=',$request->tarikh)
-            ->where('sttebus','=','')
             ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
         return response()->json($array_rekodemas);
@@ -1952,4 +1951,5 @@ class GadaiController extends Controller
 
         return response()->json($keuntungan,200);
     }
+
 }