diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2cb0be0..d43b43b 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/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{
@@ -247,11 +248,17 @@ class GadaiController extends Controller
         $total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
         $total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
 
-        $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
+        //query kadar upah baru
+        $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawagan['group_id'])->first();
+
+        dd($kadar_raw);
+
+        // query kadar upah lama
+        // $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
         
         $onepercentservices = new OnePercentServices();
         $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam);
-         // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
+        // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
         // $upah6 = $upah1 * 6;
         // $upah12 = $upah1 * 12;
         $upah1 = $keuntungan['keuntungan'];
diff --git a/app/Services/OnePercentServices.php b/app/Services/OnePercentServices.php
index b740b82..9c4c165 100644
--- a/app/Services/OnePercentServices.php
+++ b/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;
     }