fix sedikit2

app/Http/Controllers/GadaiController.php

@@ -2507,7 +2507,7 @@ class GadaiController extends Controller
 
         $gadai = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
+            ->where([['t_gadai','<=',$tarikhtawarruq]])
             ->where([['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga]])
             ->sum('pinjaman');
 
@@ -2677,9 +2677,8 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $audit = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
+            ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
-            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
         $rekodaudit = $audit->get();
         $totalrekod = $audit->sum('pinjaman');
@@ -2696,7 +2695,6 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $audit = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
             ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 

app/Http/Controllers/PolisController.php

@@ -54,4 +54,23 @@ class PolisController extends Controller
         return response()->json($polis);
 
     }
+
+    public function editPolis(Request $request)
+    {
+        $harini = Carbon::now();
+        $harini = new Carbon;
+  
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        
+        $polis = Polis::on($cawangan['mysql'])
+                ->where('norujukan','=',$request->norujukan)
+                 ->update([ 
+                    'komen1' => $request->komen1,
+                    'komen2' => $request->komen2,
+                    'teller' => $request->teller
+        ]);
+        
+        return response()->json($polis);
+
+    }
 }

routes/web.php

@@ -214,6 +214,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('polis/get/',['uses'=>'PolisController@getPolis']); 
     $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); 
     $router->post('polis/create/',['uses'=>'PolisController@createPolis']);
+    $router->put('polis/edit/',['uses'=>'PolisController@editPolis']);
 
 
     //LAPORAN API