diff --git a/app/Console/Commands/TestOnePercent.php b/app/Console/Commands/TestOnePercent.php
new file mode 100644
index 0000000..5d8af0a
--- /dev/null
+++ b/app/Console/Commands/TestOnePercent.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+use Illuminate\Console\Command;
+
+use App\Services\OnePercentServices;
+
+class TestOnePercent extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'onepercent:test';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update JBG for every active gadai';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+
+    protected $onepercentserv;
+    public function __construct(OnePercentServices $onepercentserv)
+    {
+        $this->onepercentserv = $onepercentserv;
+        parent::__construct();
+    }  
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $pemb = $this->ask('Pembiayaan?');
+        $nm = $this->ask('Nilaimarhun?');
+        $ku = $this->ask('Kadarujrah?');
+        $marg = $this->ask('Margin?');
+
+        $test = $this->onepercentserv->kiraanKeuntunganSebenar($pemb,$nm,$ku,$marg);
+        
+        dd($test);
+        return $test;
+    }
+}
\ No newline at end of file
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index d5b505a..e18917f 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -18,6 +18,8 @@ class Kernel extends ConsoleKernel
      */
     protected $commands = [
         Commands\DailyGadai::class,
+        Commands\TestOnePercent::class,
+
     ];
 
     /**
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 3503945..b017e23 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -32,8 +32,9 @@ use App\InOutMar;
 
 use Illuminate\Http\Request;
 
+use App\Services\OnePercentServices;
 
-use DB;
+use Illuminate\Support\Facades\DB;
 
 use Carbon\Carbon;
 
@@ -132,17 +133,28 @@ class GadaiController extends Controller
         $current = new Carbon();
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $gadai = Gadai::on($cawangan['mysql'])->create([
-            'kodcaw'=>$kodcaw,
-            'norujukan' => $request->norujukan,
-            'nopelanggan' => $request->nopelanggan,
-            'nokp' => $request->nokp,
-            'sirig' => $request->sirig,
-            't_gadai' => $current->toDateString(),
-            'sttebus' => '',
-            'masa' =>$current->toTimeString()
-        ]);
-        return response()->json($gadai, 201);
+        
+        try{
+            DB::transaction(function () use ($cawangan, $kodcaw, $request, $current) {
+                $gadai = Gadai::on($cawangan['mysql'])->create([
+                    'kodcaw'=>$kodcaw,
+                    'norujukan' => $request->norujukan,
+                    'nopelanggan' => $request->nopelanggan,
+                    'nokp' => $request->nokp,
+                    'sirig' => $request->sirig,
+                    't_gadai' => $current->toDateString(),
+                    'sttebus' => '',
+                    'masa' =>$current->toTimeString(),
+                    'tagbaru' => 1
+                ]);
+                return response()->json($gadai, 201);
+            });
+
+
+        }catch(\Exception $e){
+
+            echo "Gadaian Gagal: " . $e->getMessage();
+        }        
     }
 
     public function createold($kodcaw,Request $request){
@@ -235,9 +247,17 @@ class GadaiController extends Controller
         $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();
-        $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
+        
+        $onepercentservices = new OnePercentServices();
+        $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam);
+         // $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
+        // $upah6 = $upah1 * 6;
+        // $upah12 = $upah1 * 12;
+        $upah1 = $keuntungan['keuntungan'];
         $upah6 = $upah1 * 6;
         $upah12 = $upah1 * 12;
+        $ujrah = $keuntungan['ujrah'];
+        $onepercent = $keuntungan['onepercent'];
 
         $hargajualan = $request->pinjaman + $upah12;
 
@@ -247,7 +267,7 @@ class GadaiController extends Controller
                 'nilaimarhun' => $total_nilai_marhun,
                 'berat'=> $total_berat,
                 'pinjaman' => $request->pinjaman,
-                'kadarupah' => $kadar_raw['kadarupdah'],
+                'kadarupah' => $kadar_raw['kadarujrah'],
                 'marhun' => $request->marhun,
                 'percentpinj' => $margin_pinjam,
                 'teller' => $request->teller,
@@ -267,23 +287,27 @@ class GadaiController extends Controller
                 'tagkomuditi' => 0,
                 'upahdibayar' => 0.00,
                 'tempohbayar' => 0.00,
-                'lelong_tawarruq' => 1
+                'lelong_tawarruq' => 1,
+                'kadarujrah' => $kadar_raw['kadarujrah'],
+                'ujrah' => $ujrah,
+                'onepercent' => $onepercent,
+                'margin_semasa' => $margin_pinjam,
             ));
 
         $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $audit = new Audit();
-        $audit->users = $request->teller;
-        $audit->actions = $request->transaction;
-        $audit->norujukan = $norujukan;
-        $audit->new_data = $new_data;
-        if($request->transaction == 'Ubah Gadai'){
-            $audit->old_data = $old_data;
-        }
-        $audit->kodcaw = $request->kodcaw;
-        $audit->created_at = $current;
-        $audit->updated_at = $current;
-        $audit->save();
+        // $audit = new Audit();
+        // $audit->users = $request->teller;
+        // $audit->actions = $request->transaction;
+        // $audit->norujukan = $norujukan;
+        // $audit->new_data = $new_data;
+        // if($request->transaction == 'Ubah Gadai'){
+        //     $audit->old_data = $old_data;
+        // }
+        // $audit->kodcaw = $request->kodcaw;
+        // $audit->created_at = $current;
+        // $audit->updated_at = $current;
+        // $audit->save();
 
         return response()->json($gadai, 200);
     }
@@ -313,6 +337,8 @@ class GadaiController extends Controller
     }
 
     public function kiraupahTawarruq($kodcaw,$norujukan){
+        $onepercentservices = new OnePercentServices();
+
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -328,7 +354,9 @@ class GadaiController extends Controller
         }
         $bilang_bln = $tempoh - $gadai_data['tempohbayar'];
 
-        $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
+        // $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
         $upah_semasa = substr($upah_semasa_round, 0, -1);
@@ -340,6 +368,8 @@ class GadaiController extends Controller
     }
 
     public function kiraUpahRebet($kodcaw,$norujukan){
+        $onepercentservices = new OnePercentServices();
+        
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -355,7 +385,10 @@ class GadaiController extends Controller
         }
         $bilang_bln = $tempoh - $gadai_data['tempohbayar'];
 
-        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+        $upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
+
+        // $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+        $upahrebet_raw = $bilang_bln * $upah['keuntungan'];
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
         $upah_rebet = substr($upah_rebet_round, 0, -1);
@@ -441,6 +474,7 @@ class GadaiController extends Controller
         }else{
             $lelong_tawarruq = 1;
         }
+        $onepercent = new OnePercentServices();
 
         $old_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
@@ -450,50 +484,91 @@ class GadaiController extends Controller
 
         $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
 
-        $transaction = Transaction::on('mysql7')->create([
-            'trans_type' => 'A',
-            'norujukan' => $norujukan,
-            'nokp' => $gadai['nokp'],
-            'teller' => $request->teller,
-            'kodcaw' => $kodcaw,
-            'duit_masuk' => $request->bayaran,
-            'created_at' => $current,
-            'bakiharga' => $baki_hargajualan,
-            'nowakil' => (int)$request->nowakil
-        ]);
+        $margin_semasa = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
 
-        $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
-            'norujukan' => $norujukan,
-            'bayaran_keuntungan' => $upahsemasa,
-            'bayaran_pembiayaan' => $baki_bayaran,
-            'keuntungan_rebet'=> $upahrebet,
-            'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw
-        ]);
+        $keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$margin_semasa);
+        $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
 
-        $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
-            'bakipjm' => $baki_pinjaman,
-            'jbg' => 0,
-            't_update' => $current->toDateString(),
-            'bakihargajualan' => $baki_hargajualan,
-            'tempohbayar' => $gadai['tempoh'],
-            'lelong_tawarruq' => $lelong_tawarruq
-        ));
+        $onepercentasal = $gadai['pinjaman'] * (1/100);
 
-        $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+        try {
 
-        $audit = new Audit();
-        $audit->users = $request->teller;
-        $audit->actions = 'Bayaran Ansuran';
-        $audit->norujukan = $norujukan;
-        $audit->new_data = $new_data;
-        $audit->old_data = $old_data;
-        $audit->kodcaw = $kodcaw;
-        $audit->created_at = $current;
-        $audit->updated_at = $current;
-        $audit->save();
+            DB::connection('mysql7')->transaction(function () use($onepercentasal,$ujrahasal,$keuntungan,$norujukan,$gadai,$request,$kodcaw,$current,$baki_hargajualan,$upahsemasa,$baki_bayaran,$upahrebet,$cawangan,$old_data,$baki_pinjaman,$lelong_tawarruq,$margin_semasa) {
 
-        return response()->json($update_gadai, 200);
+                $transaction = Transaction::on('mysql7')->create([
+                    'trans_type' => 'A',
+                    'norujukan' => $norujukan,
+                    'nokp' => $gadai['nokp'],
+                    'teller' => $request->teller,
+                    'kodcaw' => $kodcaw,
+                    'duit_masuk' => $request->bayaran,
+                    'created_at' => $current,
+                    'bakiharga' => $baki_hargajualan,
+                    'nowakil' => (int)$request->nowakil
+                ]);
+
+                if($gadai['tempoh'] >= 12.0){
+                    $tempoh = 12;
+                }else{
+                    $tempoh = $gadai['tempoh'];
+                }
+                $bilang_bln = $tempoh - $gadai['tempohbayar'];
+
+                $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
+                    'norujukan' => $norujukan,
+                    'bayaran_keuntungan' => $upahsemasa,
+                    'bayaran_pembiayaan' => $baki_bayaran,
+                    'keuntungan_rebet'=> $upahrebet,
+                    'tarikh_bayaran'=> $current,
+                    'kodcaw'=> $kodcaw,
+                    'ujrah' => ($ujrahasal*$bilang_bln),
+                    'ujrah_rebet' => ($keuntungan['ujrah'] * $bilang_bln),
+                    'onepercent' => ($onepercentasal * $bilang_bln),
+                    'onepercent_rebet' => ($keuntungan['onepercent'] * $bilang_bln),
+                    'tempoh' => $gadai['tempoh'],
+                    'beza_tempoh' => $bilang_bln,
+                    'margin_semasa' => $margin_semasa,
+                ]);
+
+                DB::connection($cawangan['mysql'])->transaction(function () use($cawangan,$baki_pinjaman,$current,$norujukan,$gadai,$baki_hargajualan,$lelong_tawarruq,$margin_semasa){
+
+                    $margin_updated = ($baki_pinjaman / $gadai['nilaimarhun']) * 100;
+
+                    $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+                        'bakipjm' => $baki_pinjaman,
+                        'jbg' => 0,
+                        't_update' => $current->toDateString(),
+                        'bakihargajualan' => $baki_hargajualan,
+                        'tempohbayar' => $gadai['tempoh'],
+                        'lelong_tawarruq' => $lelong_tawarruq,
+                        'margin_semasa' => $margin_updated,
+                    ));
+                });
+
+                $new_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+
+                // $audit = new Audit();
+                // $audit->users = $request->teller;
+                // $audit->actions = 'Bayaran Ansuran';
+                // $audit->norujukan = $norujukan;
+                // $audit->new_data = $new_data;
+                // $audit->old_data = $old_data;
+                // $audit->kodcaw = $kodcaw;
+                // $audit->created_at = $current;
+                // $audit->updated_at = $current;
+                // $audit->save();
+
+                if(!$transaction || !$transaction_upah) {
+                    throw new \Exception('One of the database operations failed.');
+                }
+
+                DB::commit();
+                return response()->json("success", 200);
+
+            });
+        }catch(\Exception $e){
+            return response()->json("Transaction failed: " . $e->getMessage(),500);
+        }
     }
 
     public function getGadaianSemasa($kodcaw){
@@ -3627,4 +3702,24 @@ class GadaiController extends Controller
 
         return response()->json('success');
     }
+
+    public function getKadarUjrah(Request $request){
+
+        $onePercentServices = new OnePercentServices();
+
+        $kadarujrah = $onePercentServices->getKadarUjrah($request->nilaimarhun);
+
+        // $test = $this->kiraupahTawarruq('KB2','KB2231109-0001');
+        // dd($test);
+        return $kadarujrah;
+    }
+
+    public function getOnePercent(Request $request){
+        
+        $onePercentServices = new OnePercentServices();
+
+        $keuntungan = $onePercentServices->kiraanKeuntunganSebenar($request->pembiayaan,$request->nilaimarhun,$request->kadarujrah,$request->margin);
+
+        return $keuntungan;
+    }
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index ba04abe..24f7533 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -36,7 +36,7 @@ use App\StokAudit11;
 use App\StokAudit12;
 
 use App\AkruNet;
-
+use App\Services\OnePercentServices;
 use Illuminate\Http\Request;
 
 use Carbon\Carbon;
@@ -88,6 +88,8 @@ class TebusController extends Controller
     }
 
     public function kiraupahTawarruq($kodcaw,$norujukan){
+        $onepercentservices = new OnePercentServices();
+        
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -103,7 +105,9 @@ class TebusController extends Controller
         }
         $bilang_bln = $tempoh - $gadai_data['tempohbayar'];
 
-        $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
+        // $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+        $upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
 
         $upah_semasa_round = number_format($upahsemasa_raw,2);
 	    if(strpos($upah_semasa_round,',')){
@@ -118,6 +122,8 @@ class TebusController extends Controller
     }
 
     public function kiraUpahRebet($kodcaw,$norujukan){
+        $onepercentservices = new OnePercentServices();
+        
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -134,7 +140,9 @@ class TebusController extends Controller
 
         $bilang_bln = $tempoh - $gadai_data['tempohbayar'];
 
-        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+        $upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
+        $upahrebet_raw = $bilang_bln * $upah['keuntungan'];
+        // $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
 
         $upah_rebet_round = number_format($upahrebet_raw,2);
 	    if(strpos($upah_rebet_round,',')){
diff --git a/app/Services/OnePercentServices.php b/app/Services/OnePercentServices.php
new file mode 100644
index 0000000..6e0099e
--- /dev/null
+++ b/app/Services/OnePercentServices.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Services;
+
+use App\KadarUpah;
+
+class OnePercentServices
+{
+
+    protected $maks_margin = 80;
+    protected $one_percent = 1;
+
+    private function kiraanUjrah(float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
+        
+        //periksa adakah kadar ujrah ini diberi percentage
+        if($kadarujrah >= 1){
+            return;
+        }
+
+        $ujrah = ($kadarujrah/100) * $nilaimarhun;
+        $formula_margin = ($this->maks_margin - $margin) / $this->maks_margin;
+        $ujrah_margin = $formula_margin * $kadarujrah;
+        $rebate_ujrah = $nilaimarhun*($ujrah_margin/100);
+        $ujrah_sebenar = $ujrah - $rebate_ujrah;
+
+        return $ujrah_sebenar;
+    }
+
+    private function kiraanOnePercent(float $pembiayaan = 0.0){
+
+        //periksa adakah pembiayaan adalah null atau kosong.
+        if($pembiayaan == 0 || $pembiayaan == null)
+            return;
+        
+            $onepercent = ($this->one_percent/100) * $pembiayaan;
+
+
+        return $onepercent;
+    }
+
+    public function kiraanUjrahSebenar(float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
+
+        if($kadarujrah >= 1){
+            return;
+        }
+
+        $ujrah = ($kadarujrah/100) * $nilaimarhun;
+        $formula_margin = ($this->maks_margin - $margin) / $this->maks_margin;
+        $rebate_ujrah = $formula_margin * $ujrah;
+        $ujrah_sebenar = $ujrah - $rebate_ujrah;
+        
+        return $ujrah_sebenar;
+    }
+
+    public function kiraanKeuntunganSebenar(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
+
+        $onepercent = $this->kiraanOnePercent($pembiayaan);
+        $ujrah_sebenar = $this->kiraanUjrah($nilaimarhun,$kadarujrah,$margin);
+
+        $keuntungan = $onepercent + $ujrah_sebenar;
+
+        return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar];
+    }
+
+    public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{
+
+        $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->get()->toArray();
+
+        return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
+    }
+}
diff --git a/app/TransaksiKeuntungan.php b/app/TransaksiKeuntungan.php
index 691485b..6176d26 100644
--- a/app/TransaksiKeuntungan.php
+++ b/app/TransaksiKeuntungan.php
@@ -14,7 +14,7 @@ class TransaksiKeuntungan extends Model
      * @var array
      */
     protected $fillable = [
-      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet'
+      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan','keuntungan_rebet','ujrah','ujrah_rebet','onepercent','onepercent_rebet','tempoh','beza_tempoh','margin_semasa'
     ];
 
     /**
diff --git a/database/migrations/2023_11_08_115215_add_onepercent_to_gadai_table.php b/database/migrations/2023_11_08_115215_add_onepercent_to_gadai_table.php
new file mode 100644
index 0000000..3262f74
--- /dev/null
+++ b/database/migrations/2023_11_08_115215_add_onepercent_to_gadai_table.php
@@ -0,0 +1,70 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class AddOnepercentToGadaiTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+
+    /**
+     * 
+     * @var object $db_connection
+     */
+
+
+    public function getActiveDB(){
+        $config_db = array_keys(config("database.connections"));
+                
+        $db_connection = array_filter($config_db,function($connection){
+            try{
+                if($connection == 'mysql7')
+                    return false;
+
+                $db = DB::connection($connection)->getPdo();
+                return true;
+            } catch(\Exception $e){
+                return false;
+            }
+        });
+        return $db_connection;
+    }
+
+    public function up()
+    {
+        $db_connection = $this->getActiveDB();
+        
+        foreach($db_connection as $dbase){
+            Schema::connection($dbase)->table('gadai', function (Blueprint $table) {
+                $table->decimal('kadarujrah', 5, 2);
+                $table->decimal('ujrah', 9, 2);
+                $table->decimal('onepercent', 9, 2);
+                $table->decimal('margin_semasa', 5, 2);
+                $table->tinyInteger('tagbaru')->default(0);
+            });
+        }
+        
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $db_connection = $this->getActiveDB();
+
+        foreach($db_connection as $dbase){
+            Schema::connection($dbase)->table('gadai', function (Blueprint $table) {
+                $table->dropColumn(['kadarujrah', 'ujrah', 'onepercent','margin_semasa','tagbaru']);
+            });
+        }
+    }
+}
diff --git a/database/migrations/2023_11_08_143916_create_history_onepercent_table.php b/database/migrations/2023_11_08_143916_create_history_onepercent_table.php
new file mode 100644
index 0000000..9854de5
--- /dev/null
+++ b/database/migrations/2023_11_08_143916_create_history_onepercent_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateHistoryOnepercentTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('history_onepercent', function (Blueprint $table) {
+            $table->id();
+            $table->decimal('tempoh', 10, 2);
+            $table->decimal('ujrah', 10, 2);
+            $table->decimal('onepercent', 10, 2);
+            $table->decimal('margin_semasa', 5, 2);
+            $table->decimal('bakipinjaman', 10, 2);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('history_onepercent');
+    }
+}
diff --git a/database/migrations/2023_11_08_150612_add_onepercent_to_kadarupah_table.php b/database/migrations/2023_11_08_150612_add_onepercent_to_kadarupah_table.php
new file mode 100644
index 0000000..022542c
--- /dev/null
+++ b/database/migrations/2023_11_08_150612_add_onepercent_to_kadarupah_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOnepercentToKadarupahTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::connection('mysql7')->table('kadarupah', function (Blueprint $table) {
+            $table->decimal('kadarujrah', 5, 2);
+            $table->decimal('kadaronepercent', 5, 2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection('mysql7')->table('kadarupah', function (Blueprint $table) {
+            $table->dropColumn(['kadarujrah','kadaronepercent']);
+
+        });
+    }
+}
diff --git a/database/migrations/2023_11_11_101144_add_onepercent_to_transaction_keuntungan_table.php b/database/migrations/2023_11_11_101144_add_onepercent_to_transaction_keuntungan_table.php
new file mode 100644
index 0000000..59d4036
--- /dev/null
+++ b/database/migrations/2023_11_11_101144_add_onepercent_to_transaction_keuntungan_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddOnepercentToTransactionKeuntunganTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::connection('mysql7')->table('transaksi_keuntungan', function (Blueprint $table) {
+            $table->decimal('ujrah', 5, 2);
+            $table->decimal('ujrah_rebet', 5, 2);
+            $table->decimal('onepercent', 5, 2);
+            $table->decimal('onepercent_rebet', 5, 2);
+            $table->decimal('tempoh', 5, 2);
+            $table->decimal('beza_tempoh', 5, 2);
+            $table->decimal('margin_semasa', 5, 2);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection('mysql7')->table('transaksi_keuntungan', function (Blueprint $table) {
+            $table->dropColumn(['ujrah', 'ujrah_rebet', 'onepercent', 'onepercent_rebet', 'tempoh', 'beza_tempoh', 'margin_semasa']);
+        });
+    }
+}
diff --git a/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php b/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php
new file mode 100644
index 0000000..8b09cc0
--- /dev/null
+++ b/database/migrations/2023_11_11_104203_add_onepercent_to_tebus_table.php
@@ -0,0 +1,65 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class AddOnepercentToTebusTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+
+    /**
+     * 
+     * @var object $db_connection
+     */
+
+    public function getActiveDB(){
+        $config_db = array_keys(config("database.connections"));
+                
+        $db_connection = array_filter($config_db,function($connection){
+            try{
+                if($connection == 'mysql7')
+                    return false;
+
+                $db = DB::connection($connection)->getPdo();
+                return true;
+            } catch(\Exception $e){
+                return false;
+            }
+        });
+        return $db_connection;
+}
+
+    public function up()
+    {
+        $db_connection = $this->getActiveDB();
+        
+        foreach($db_connection as $dbase){
+            Schema::connection($dbase)->table('tebus', function (Blueprint $table) {
+                $table->decimal('ujrah', 9, 2);
+                $table->decimal('onepercent', 9, 2);
+            });
+        };
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $db_connection = $this->getActiveDB();
+
+        foreach($db_connection as $dbase){
+            Schema::connection($dbase)->table('tebus', function (Blueprint $table) {
+                $table->dropColumn(['ujrah', 'onepercent']);
+            });
+        }
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index 2cd035c..7250486 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -573,6 +573,12 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('backup/stok/audit',['uses'=>'BackupStokAuditController@backupStokAudit']);
     $router->get('backup/stok/audit/problem',['uses'=>'BackupStokAuditController@backupStokAuditProblem']);
     $router->get('stokaudit/backdate',['uses'=>'BackupStokAuditController@LaporanAuditBackdate']);
+
+
+    //One Percent
+    $router->get('kadarujrah',['uses' => 'GadaiController@getKadarUjrah']);
+    $router->post('onepercent',['uses' => 'GadaiController@getOnePercent']);
+
 });
 
 $router->group(['prefix'=>'e-arrahn'], function () use ($router){