read group id

app/Http/Controllers/GadaiController.php

@@ -133,6 +133,7 @@ class GadaiController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
 
+        
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         try{

app/Services/OnePercentServices.php

@@ -74,7 +74,7 @@ class OnePercentServices
 
     public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{
 
-        $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->get()->toArray();
+        $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$cawagan['group_id'])->get()->toArray();
 
         return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
     }