diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 1c28521..3bf9421 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel
     {
         //
 
-        $schedule->command('gadai:daily')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:00');
+        // $schedule->command('gadai:daily')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:00');
 
         $schedule->job(new WhatsappUnsoldCommodityScanner)->daily()->timezone('Asia/Kuala_Lumpur')->at('00:00');
         
diff --git a/app/Http/Controllers/BackupStokAuditController.php b/app/Http/Controllers/BackupStokAuditController.php
index d51f287..191806e 100644
--- a/app/Http/Controllers/BackupStokAuditController.php
+++ b/app/Http/Controllers/BackupStokAuditController.php
@@ -27,7 +27,7 @@ class BackupStokAuditController extends Controller
 {
     public function backupStokAudit(Request $request){
         if($request->zone == 'all'){
-            $cawangan = Cawangan::on('mysql7')->get();
+            $cawangan = Cawangan::on('mysql7')->where('version','v2')->get();
         }else{
             $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get();
         }
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 3b5dced..c98fae7 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -303,7 +303,7 @@ class LelongController extends Controller
             }
         }
 
-        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong, 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong];
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => abs($rugilelong), 'baki' => $baki_lelong, 'rugi' => $rugi_lelong, 'jumlahlelong' => $jumlah_lelong, 'caslelong' => $cas_lelong];
 
         return response()->json($arraylelong,200);
     }
@@ -543,7 +543,7 @@ class LelongController extends Controller
         ->whereYear('t_jual','=',$current->year)
         ->sum('cajlelong');
 
-        if($kodcaw === '011232')
+        if($kodcaw === '011232' && $current->year < 2023)
             $cajlelong +=122.5;
 
         return response()->json($cajlelong,200);
diff --git a/app/Support/OnePercent.php b/app/Support/OnePercent.php
index 603928b..1638a45 100644
--- a/app/Support/OnePercent.php
+++ b/app/Support/OnePercent.php
@@ -70,8 +70,9 @@ class OnePercent extends MasterServices
     }
 
     public function getOnePercent(HttpRequest $request){
+        $margin = (!is_numeric($request->margin)) ? 0 : $request->margin;
         $onePercentServices = new Calculation();
-        $keuntungan = $onePercentServices->kiraanKeuntunganSebenar($request->pembiayaan,$request->nilaimarhun,$request->kadarujrah,$request->margin);
+        $keuntungan = $onePercentServices->kiraanKeuntunganSebenar($request->pembiayaan,$request->nilaimarhun,$request->kadarujrah,$margin);
 
         return $keuntungan;
     }
diff --git a/app/Support/v1/Penebusan.php b/app/Support/v1/Penebusan.php
index 6f78b4d..7c35110 100644
--- a/app/Support/v1/Penebusan.php
+++ b/app/Support/v1/Penebusan.php
@@ -455,6 +455,12 @@ class Penebusan
             $rebet = 0;
         }
 
+        //check duplicate
+        $data = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->where('trans_type','=','T')->first();
+        if(!empty($data)){
+            return 'duplicate';
+        }
+
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         if($gadai['hargajualan'] == null){
@@ -592,6 +598,12 @@ 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';
+        }
+
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
             'sttebus' => "T",
             't_update' => $current->toDateString(),
diff --git a/app/Support/v2/GadaiV2.php b/app/Support/v2/GadaiV2.php
index 8f90f44..ee08f42 100644
--- a/app/Support/v2/GadaiV2.php
+++ b/app/Support/v2/GadaiV2.php
@@ -242,6 +242,8 @@ class GadaiV2
             $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
 
             $onepercentasal = $gadai['pinjaman'] * (1/100);
+            $ujrahasal = $onepercent->getRoundedMethod($ujrahasal);
+            $onepercentasal = $onepercent->getRoundedMethod($onepercentasal);
 
             try {
 
diff --git a/routes/web.php b/routes/web.php
index b2b3a62..517d73d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -455,7 +455,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('TuntutBaki/resit/{kodcaw}/{norujukan}',['uses'=>'LelongController@resitLelong']);
     $router->post('Tuntutbakisimpan/{kodcaw}',['uses'=>'LelongController@simpantuntutbaki']);
     $router->put('tuntutbakiupdate/{kodcaw}/{norujukan}',['uses'=>'LelongController@updatetagtbaki']);
-
+    $router->get('TuntutBakiTarikh/{kodcaw}',['uses'=>'LelongController@showTuntutBakiTarikh']);
+    
     //API KOD PRODUK
     $router->get('getProduct/{kodcaw}',['uses'=>'ProductController@getProduct']); //add 2021-02-11