diff --git a/app/Support/v2/Penebusan.php b/app/Support/v2/Penebusan.php
index 217aca8..68d1c58 100644
--- a/app/Support/v2/Penebusan.php
+++ b/app/Support/v2/Penebusan.php
@@ -95,39 +95,22 @@ class Penebusan
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
+        $total_rebet = Transaction::on('mysql7')
+                    ->selectRaw('SUM(onepercent - onepercent_rebet) as onepercent, SUM(ujrah - ujrah_rebet) as ujrah')
+                    ->leftJoin('transaksi_keuntungan as trans', function($join)
+                    {
+                            $join->on('transaction.norujukan', '=', 'trans.norujukan');
+                            $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+                    })
+                    ->where('transaction.trans_type','A')
+                    ->where('trans.norujukan','=',$norujukan)->get()->toArray();
 
-        $gadai_data = Gadai::on($cawangan['mysql'])
-                    ->where('norujukan','=',$norujukan)
-                    ->first();
-
-        if($gadai_data['tempoh'] >= 12.0){
-            $tempoh = 12;
-        }else{
-            $tempoh = $gadai_data['tempoh'];
+        if(!empty($total_rebet))            
+            return $total_rebet[0];
+        else
+            return 0.00;
         }
 
-        $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar'];
-
-        $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
-
-        // $upah_rebet = round($upahrebet_raw,PHP_ROUND_HALF_UP);
-        $upah_rebet_round = number_format($upahrebet_raw,2);
-	    if(strpos($upah_rebet_round,',')){
-            $upah_rebet_round = str_replace(',','',$upah_rebet_round);
-        }
-        $upah_rebet = substr($upah_rebet_round, 0, -1);
-	    if(strpos($upah_rebet,',')){
-            $upah_rebet = str_replace(',','',$upah_rebet);
-        }
-
-        $total_untung_rebet = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->sum('keuntungan_rebet');
-        $total_untung_asal = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->sum('bayaran_keuntungan');
-        $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-
-        $keuntungan_rebet_sebenar = $upah_rebet - $beza_keuntungan;
-        return $keuntungan_rebet_sebenar;
-    }
-
     public function upahTawarruq($kodcaw,$norujukan,$jeniskeuntungan){
         $onepercentservices = new Calculation();
 
@@ -496,6 +479,13 @@ class Penebusan
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
+        //check duplicate
+        $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->whereIn('trans_type', ['P', 'T', 'S'])->first();
+
+        if(!empty($data)){
+            return 'duplicate';
+        }
+
         $ujrah=0;$onepercent=0;$rounded=0;
         if($gadai['hargajualan'] == null){
             $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
@@ -511,6 +501,9 @@ class Penebusan
             if($request->jeniskeuntungan == 'onepercent'){
                 $array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan);
                 $array_onepercent_rebet = $this->kiraupahUjrahOnePercentRebate($kodcaw,$norujukan);
+                $onepercent_rebet = $array_onepercent_rebet['onepercent'] - $upah_rebet['onepercent'];
+                $ujrah_rebet = $array_onepercent_rebet['ujrah'] - $upah_rebet['ujrah'];
+
                 $margin_semasa = ($gadai['bakipjm']/$gadai['nilaimarhun']) * 100;
                 $ujrah = $array_onepercent['ujrah'];
                 $onepercent = $array_onepercent['onepercent'];
@@ -568,9 +561,9 @@ class Penebusan
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw,
             'ujrah' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['ujrah'] : 0,
-            'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['ujrah'] : 0,
+            'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $ujrah_rebet : 0,
             'onepercent' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['onepercent'] : 0,
-            'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['onepercent'] : 0,
+            'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $onepercent_rebet : 0,
             'margin_semasa' => ($request->jeniskeuntungan == 'onepercent') ? $margin_semasa : 0,
             'tempoh' => $gadai['tempoh'],
             'beza_tempoh' => ($gadai['tempoh'] - $gadai['tempohbayar']),
@@ -652,6 +645,13 @@ class Penebusan
 
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
+        //check duplicate
+        $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','AT')->first();
+
+        if(!empty($data)){
+            return 'duplicate';
+        }
+
         $ujrah=0;$onepercent=0;$rounded=0;
         if($gadai['hargajualan'] == null){
             $harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
@@ -667,6 +667,10 @@ class Penebusan
             if($request->jeniskeuntungan == 'onepercent'){
                 $array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan);
                 $array_onepercent_rebet = $this->kiraupahUjrahOnePercentRebate($kodcaw,$norujukan);
+
+                $onepercent_rebet = $array_onepercent_rebet['onepercent'] - $upah_rebet['onepercent'];
+                $ujrah_rebet = $array_onepercent_rebet['ujrah'] - $upah_rebet['ujrah'];
+
                 $margin_semasa = ($gadai['bakipjm']/$gadai['nilaimarhun']) * 100;
                 $ujrah = $array_onepercent['ujrah'];
                 $onepercent = $array_onepercent['onepercent'];
@@ -732,9 +736,9 @@ class Penebusan
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw,
             'ujrah' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['ujrah'] : 0,
-            'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['ujrah'] : 0,
+            'ujrah_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $ujrah_rebet : 0,
             'onepercent' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent['onepercent'] : 0,
-            'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $array_onepercent_rebet['onepercent'] : 0,
+            'onepercent_rebet' => ($request->jeniskeuntungan == 'onepercent') ? $onepercent_rebet : 0,
             'margin_semasa' => ($request->jeniskeuntungan == 'onepercent') ? $margin_semasa : 0,
             'tempoh' => $gadai['tempoh'],
             'beza_tempoh' => ($gadai['tempoh'] - $gadai['tempohbayar']),