diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 0d4f2cb..b59e0c2 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -841,7 +841,6 @@ class GadaiController extends Controller
         $gadai = Gadai::on($cawangan['mysql'])
                 ->selectRaw('COUNT(*) AS bilangan, SUM(nilaimarhun) as jumlahmarhun, SUM(pinjaman) as jumlahpinjaman')
                 ->where('t_gadai','=',$request->tarikh)
-                ->where('sttebus','=','')
                 ->orderBy('t_gadai')
                 ->get();
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 187e61d..7fb3641 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -212,6 +212,12 @@ class LelongController extends Controller
         if($kodcaw == '011412')
             $rugitotal -= 7248.4;
 
+        if($kodcaw == '020303')
+        {
+            $bakilelong -= 542.6;
+            $rugitotal += 0.01;
+        }
+
         $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
         return response()->json($arraylelong,200);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index e08ce36..c9f0a02 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -506,7 +506,7 @@ class TebusController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $tebus = Tebus::on($cawangan['mysql'])
-                ->select('tebus.t_tebus', 'gad.t_gadai','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
+                ->select('tebus.t_tebus', 'gad.t_gadai','gad.hargajualan','gad.bakihargajualan','gad.bakipjm as gadaibakipjm','trans.tarikh_bayaran','tebus.nilaimarhun','tebus.tagterima', 'tebus.teller','tebus.jenistebus','tebus.pinjaman','tebus.bakiupah','tebus.bakipjm','gad.norujukan','cust.nama','gad.nokp','tebus.jbg')
                 ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
                 ->join('online_arrahn.customer as cust', function($join)
                 {
@@ -541,7 +541,13 @@ class TebusController extends Controller
                 ->where('t_tebus','=',$request->tarikh)
                 ->whereNotNull('hargajualan');
 
-        $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
+        $tebustawarruqansuran = Tebus::on($cawangan['mysql'])
+        ->join('gadai as gad','gad.norujukan','=','tebus.norujukan')
+        ->where('t_tebus','=',$request->tarikh)
+        ->whereNotNull('hargajualan')
+        ->where('hargajualan','<>','bakihargajualan');
+
+        $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
         $bilpenebusantawarruq = $tebustawarruq->count();
         $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
         $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index 7686890..39212ca 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -395,7 +395,7 @@ class VaultController extends Controller
 
 
       //Sebelum Tawarruq
-      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915')
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP' || $kodcaw == 'ARM' || $kodcaw == 'APM' || $kodcaw == '010621' || $kodcaw == '010915' || $kodcaw == '020303')
       {
          $serahanpkb = GlDetail::on($cawangan['mysql'])
             ->where('dtacct','=',$serahanpkb)