diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index f7670a7..dc438e4 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,22 @@ 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');
 
+<<<<<<< HEAD
         $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();
+        
+>>>>>>> f15cf924e7152a396316ea99d81e2535c56977f0
         $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;
     }
diff --git a/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php
index e728acb..1c61cb9 100644
--- a/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php
+++ b/database/migrations/2023_11_14_121109_add_columns_to_komuditi_transaksi.php
@@ -42,7 +42,7 @@ class AddColumnsToKomuditiTransaksi extends Migration
     {
         $online_arrahn_connection_array = array_filter(config('database.connections'), function($connection) {
 
-            if($connection['database'] === 'online_arrahn'){
+            if($connection['database'] === 'online_arrahn' || $connection['database'] === 'master_krk'){
                 return true;
             }
 
@@ -53,7 +53,7 @@ class AddColumnsToKomuditiTransaksi extends Migration
 
 
         if(empty($online_arrahn_connection_array)){
-            throw new Exception("online_arrahn doesn't exist in config.database.connections array");
+            throw new Exception("online_arrahn or master_krk doesn't exist in config.database.connections array");
         }
 
         return array_keys($online_arrahn_connection_array)[0];
diff --git a/database/migrations/2023_11_29_124752_create_group_table.php b/database/migrations/2023_11_29_124752_create_group_table.php
new file mode 100644
index 0000000..90ae9c8
--- /dev/null
+++ b/database/migrations/2023_11_29_124752_create_group_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group', function (Blueprint $table) {
+            $table->id();
+            $table->string('slug')->nullable();
+            $table->string('description')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group');
+    }
+}
diff --git a/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php b/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php
new file mode 100644
index 0000000..b280e41
--- /dev/null
+++ b/database/migrations/2023_11_29_142901_add_group_id_to_kadarupah_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGroupIdToKadarupahTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('kadarupah', function (Blueprint $table) {
+            //
+            $table->integer('group_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection('mysql7')->table('kadarupah', function (Blueprint $table) {
+            $table->dropColumn(['group_id']);
+        });
+    }
+}
diff --git a/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php b/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php
new file mode 100644
index 0000000..157b8e2
--- /dev/null
+++ b/database/migrations/2023_11_29_155314_add_group_id_to_arrahn_master_db_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddGroupIdToArrahnMasterDbTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('arrahn_master_db', function (Blueprint $table) {
+            //
+            $table->integer('group_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection('mysql7')->table('arrahn_master_db', function (Blueprint $table) {
+            $table->dropColumn(['group_id']);
+        });
+    }
+}