diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 57ac6e6..2a0d97d 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -25,11 +25,6 @@ class KhazanahController extends Controller
 {
 
 
- 
-
-
-
-
     public function __construct()
     {
         $this->middleware('auth');
@@ -239,6 +234,8 @@ class KhazanahController extends Controller
  
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan_barcode)->json();
         $gadai_detail = $gadai[0];
+        $hargajual=$gadai[0]['hargajualan'];
+        $upah12=$gadai[0]['upah12'];
         $tarikh_gadai=$gadai[0]['t_gadai'];
         $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan_barcode])->json();
         //dd($tebus);
@@ -282,7 +279,7 @@ class KhazanahController extends Controller
           
        //tarikh tawawruqq
        $tarikh_gadai_tawaruq_start='2021-04-14';
-       if($tarikh_gadai<$tarikh_gadai_tawaruq_start)
+       if($upah12==null && $hargajual==null)
        {
  
  
@@ -296,6 +293,7 @@ class KhazanahController extends Controller
         $debit_Pinjaman=$get_lejerPinjam[0]['debit'];
         $recno_Pinjaman=$get_lejerPinjam[0]['recno'];  
 
+        
           if($jenis_tebus=='T')
            {