diff --git a/app/Gadai.php b/app/Gadai.php
index 9372369..d5864da 100644
--- a/app/Gadai.php
+++ b/app/Gadai.php
@@ -72,6 +72,7 @@ class Gadai extends Model
         'upah12',
         'tagkomuditi',
         'tempohbayar',
+        'lelong_tawarruq'
     ];
 
     /**
diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dea0e97..01b5a5e 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -28,8 +28,7 @@ use Carbon\Carbon;
 class GadaiController extends Controller
 {
 
-    public function showAllGadais()
-    {
+    public function showAllGadais(){
         return response()->json(Gadai::all());
     }
 
@@ -41,8 +40,7 @@ class GadaiController extends Controller
         return response()->json($gadaiTransaction);
     }
 
-    public function showOneGadai($noic)
-    {
+    public function showOneGadai($noic){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];
         foreach($cawangan_all as $index=>$cawangan){
@@ -55,8 +53,7 @@ class GadaiController extends Controller
         return response()->json($gadai_all);
     }
 
-    public function showOneGadaiMobile($noic)
-    {
+    public function showOneGadaiMobile($noic){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $gadai_all = [];
         foreach($cawangan_all as $index=>$cawangan){
@@ -97,16 +94,14 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function showOneGadaibyRujukanAndCawangan($kodcaw,$norujukan)
-    {
+    public function showOneGadaibyRujukanAndCawangan($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->get();
 
         return response()->json($gadai);
     }
 
-    public function create($kodcaw,Request $request)
-    {
+    public function create($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -124,8 +119,7 @@ class GadaiController extends Controller
         return response()->json($gadai, 201);
     }
 
-    public function createold($kodcaw,Request $request)
-    {
+    public function createold($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -188,8 +182,7 @@ class GadaiController extends Controller
     }
 
 
-    public function daftarGadaiMarhun($norujukan,Request $request)
-    {
+    public function daftarGadaiMarhun($norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -228,7 +221,10 @@ class GadaiController extends Controller
                 't_matang1' => $t_kontrak,
                 'tempoh' => 0.5,
                 'kuantiti' => $request->kuantiti_marhun,
-                'tagkomuditi' => 0
+                'tagkomuditi' => 0,
+                'upahdibayar' => 0.00,
+                'tempohbayar' => 0.00,
+                'lelong_tawarruq' => 1
             ));
         return response()->json($gadai, 200);
     }
@@ -266,31 +262,17 @@ class GadaiController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        if($gadai_data['tempoh'] > 6){
-            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-            $upah_semasa_round = number_format($upahsemasa_raw,2);
-            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-        }else{
-            if($gadai_data['tempoh'] == 6){
-                if($gadai_data['bakiupah'] != 0){
-                    $upah_semasa = $gadai_data['bakiupah'];
-                }else{
-                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                    $upah_semasa_round = number_format($upahsemasa_raw,2);
-                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-                }
-            }else{
-                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                $upah_semasa_round = number_format($upahsemasa_raw,2);
-                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-            }
-        }
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+
+        $upah_semasa_round = number_format($upahsemasa_raw,2);
+        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
 
         return $upah_semasa;
     }
 
-    public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request)
-    {
+    public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -299,32 +281,22 @@ class GadaiController extends Controller
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
         
-        if($gadai['tempoh'] > 6){
-            $baki_bayaran = $request->bayaran - $upahsemasa;
-            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            $baki_upah = 0;
-            $keuntungan_sebenar = $upahsemasa;
+        $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
+
+        $total_bayaran_semasa = $total_bayaran_prev + $request->bayaran;
+
+        if($total_bayaran_semasa >= $gadai['bakiupah']){
+            $lelong_tawarruq = 0;
         }else{
-            if($gadai['bakiupah'] > $request->bayaran){
-                $keuntungan_sebenar = $request->bayaran;
-            }else{
-                $keuntungan_sebenar = $gadai['bakiupah'];
-            }
-            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            if($gadai['bakipjm'] == null){
-                $baki_pinjaman = $gadai['pinjaman'];
-            }else{
-                $baki_pinjaman = $gadai['bakipjm'];
-            }
-            
-            if($baki_upah < 0){
-                $baki_pinjaman = $baki_pinjaman + $baki_upah;
-                $baki_upah = 0;
-            }
+            $lelong_tawarruq = 1;
         }
 
+        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+
+        $baki_bayaran = $request->bayaran - $upahsemasa;
+
+        $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+
         $transaction = Transaction::on('mysql7')->create([
             'trans_type' => 'A',
             'norujukan' => $norujukan,
@@ -339,9 +311,9 @@ class GadaiController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
+            'bayaran_pembiayaan' => $baki_bayaran,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar' => $keuntungan_sebenar
+            'kodcaw'=> $kodcaw
         ]);
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -354,8 +326,7 @@ class GadaiController extends Controller
         return response()->json($update_gadai, 200);
     }
 
-    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,Request $request)
-    {
+    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -364,32 +335,22 @@ class GadaiController extends Controller
 
         $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
-        if($gadai['tempoh'] > 6){
-            $baki_bayaran = $request->bayaran - $upahsemasa;
-            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            $baki_upah = 0;
-            $keuntungan_sebenar = $upahsemasa;
+        $total_bayaran_prev = Transaction::on('mysql7')->where([['norujukan','=',$norujukan],['trans_type','=','A']])->sum('duit_masuk');
+
+        $total_bayaran_semasa = $total_bayaran_prev + $request->bayaran;
+
+        if($total_bayaran_semasa >= $gadai['bakiupah']){
+            $lelong_tawarruq = 0;
         }else{
-            if($gadai['bakiupah'] > $request->bayaran){
-                $keuntungan_sebenar = $request->bayaran;
-            }else{
-                $keuntungan_sebenar = $gadai['bakiupah'];
-            }
-            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-            if($gadai['bakipjm'] == null){
-                $baki_pinjaman = $gadai['pinjaman'];
-            }else{
-                $baki_pinjaman = $gadai['bakipjm'];
-            }
-            
-            if($baki_upah < 0){
-                $baki_pinjaman = $baki_pinjaman + $baki_upah;
-                $baki_upah = 0;
-            }
+            $lelong_tawarruq = 1;
         }
 
+        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+
+        $baki_bayaran = $request->bayaran - $upahsemasa;
+
+        $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+
         $transaction = Transaction::on('mysql7')->create([
             'trans_type' => 'A',
             'norujukan' => $norujukan,
@@ -404,9 +365,9 @@ class GadaiController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
+            'bayaran_pembiayaan' => $baki_bayaran,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar' => $keuntungan_sebenar
+            'kodcaw'=> $kodcaw
         ]);
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -414,12 +375,13 @@ class GadaiController extends Controller
             'bakiupah' => $baki_upah,
             'jbg' => 0,
             't_update' => $current->toDateString(),
-            'bakihargajualan' => $baki_hargajualan
+            'bakihargajualan' => $baki_hargajualan,
+            'tempohbayar' => $gadai['tempoh'],
+            'lelong_tawarruq' => $lelong_tawarruq
         ));
         return response()->json($update_gadai, 200);
     }
 
-
     public function getGadaianSemasa($kodcaw){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -514,8 +476,7 @@ class GadaiController extends Controller
     }
 
     
-    public function barcodeScanTebus($kodcaw,$norujukan)
-    {
+    public function barcodeScanTebus($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
         $namaTeller=$gadai['tellernew'];
@@ -566,7 +527,6 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-
     public function getLaporanGadai($kodcaw,$tarikh){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
@@ -589,8 +549,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function dashboardall($kodcaw)
-    {
+    public function dashboardall($kodcaw){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -670,8 +629,7 @@ class GadaiController extends Controller
 
     }
 
-    public function GadaiTebusListTeller($kodcaw,Request $request)
-    {
+    public function GadaiTebusListTeller($kodcaw,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -898,8 +856,7 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
-    public function updateHistoryGadai($kodcaw,$norujukan,Request $request)
-    {
+    public function updateHistoryGadai($kodcaw,$norujukan,Request $request){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $updatehistory = Gadai::on($cawangan['mysql'])
@@ -1248,8 +1205,7 @@ class GadaiController extends Controller
         }
         return response()->json(number_format($upahToday,2));
     }
-    public function showAllGadaiTerkumpul()
-    {
+    public function showAllGadaiTerkumpul(){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
         $current = new Carbon();
@@ -1352,8 +1308,6 @@ class GadaiController extends Controller
         return response()->json(number_format($jumlahPetibesi,2));
     }
 
-    
-
     public function prestasiCawangan(Request $request){
 
         if($request->tarikh == null){
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 17b277b..3d45bb8 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -33,30 +33,7 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-
-        $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
-
-        $transaction = Transaction::on('mysql7')
-                    ->where([['norujukan','=',$norujukan],['trans_type','=','A']])
-                    ->get();
-
-        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
-                                ->where('norujukan','=',$norujukan)
-                                ->get();
-
-        $totalBayaranKeuntungan = 0;
-        $totalBayaran = 0;
-
-
-        foreach($transaction as $index=>$trans){
-            $totalBayaran += $trans['duit_masuk'];
-        }
-
-        foreach($transaction_keuntungan as $index=>$untung){
-            $totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
-        }
-
-        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upah_semasa;
+        $rebet = $this->rebetselepastawarruq($kodcaw,$norujukan);
 
         $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
 
@@ -72,25 +49,12 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        if($gadai_data['tempoh'] > 6){
-            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-            $upah_semasa_round = number_format($upahsemasa_raw,2);
-            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-        }else{
-            if($gadai_data['tempoh'] == 6){
-                if($gadai_data['bakiupah'] != 0){
-                    $upah_semasa = $gadai_data['bakiupah'];
-                }else{
-                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                    $upah_semasa_round = number_format($upahsemasa_raw,2);
-                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-                }
-            }else{
-                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-                $upah_semasa_round = number_format($upahsemasa_raw,2);
-                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
-            }
-        }
+        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
+
+        $upahsemasa_raw = $bilangan_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
+
+        $upah_semasa_round = number_format($upahsemasa_raw,2);
+        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
 
         return $upah_semasa;
     }
@@ -112,11 +76,7 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-
-        $upah_semasa_round = round($upahsemasa,2);
-
-        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $array_recno_marhun = $request->array_recno;
 
@@ -136,8 +96,6 @@ class TebusController extends Controller
 
         $totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
 
-        // $total_harga_tebus += $upahsemasa;
-
         return response()->json($totalhargatebus);
     }
 
@@ -251,29 +209,13 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-                    
-        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
-        $transaction = Transaction::on('mysql7')
-                    ->where([['norujukan','=',$norujukan],['trans_type','=','A']])
-                    ->get();
+        $bln_tebus_awl = 12 - $gadai_data['tempoh'];
 
-        $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
-                                ->where('norujukan','=',$norujukan)
-                                ->get();
+        $rebet_raw = $bln_tebus_awl * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
 
-        $totalBayaranKeuntungan = 0;
-        $totalBayaran = 0;
-
-        foreach($transaction as $index=>$trans){
-            $totalBayaran += $trans['duit_masuk'];
-        }
-
-        foreach($transaction_keuntungan as $index=>$untung){
-            $totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
-        }
-
-        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa;
+        $rebet_round = number_format($upahsemasa_raw,2);
+        $rebet = (float)substr($rebet_round, 0, -1);
 
         return $rebet;
     }
@@ -347,8 +289,7 @@ class TebusController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> $kodcaw,
-            'keuntungan_sebenar'=>$request->bakiupah
+            'kodcaw'=> $kodcaw
         ]);
 
         
diff --git a/app/TransaksiKeuntungan.php b/app/TransaksiKeuntungan.php
index 963fd6b..57bbca1 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','keuntungan_sebenar'
+      'norujukan','bayaran_keuntungan','tarikh_bayaran','kodcaw','bayaran_pembiayaan'
     ];
 
     /**