diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index b3f71e5..de49b27 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2401,7 +2401,7 @@ class GadaiController extends Controller
                 $tarikhtawarruq = '2021-06-29';
             break;
             case '011231':
-                $tarikhtawarruq = '2021-06-24';
+                $tarikhtawarruq = '2021-06-23';
             break;
             case '011232':
                 $tarikhtawarruq = '2021-06-28';
diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php
index 6f35d4a..9ecf456 100644
--- a/app/Http/Controllers/KelulusanController.php
+++ b/app/Http/Controllers/KelulusanController.php
@@ -118,7 +118,7 @@ class KelulusanController extends Controller
          }
            
       }
-      else
+      else if($pengesahan == 'operasi')
       {
          if($request->pembatalan == null)
          {
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index ea6992d..1882476 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/PanjarController.php b/app/Http/Controllers/PanjarController.php
index 6583daa..e127649 100644
--- a/app/Http/Controllers/PanjarController.php
+++ b/app/Http/Controllers/PanjarController.php
@@ -154,7 +154,6 @@ class PanjarController extends Controller
       if($kodcaw == 'APM')
       {
          $perubatan = $perubatan - 10;
-         $baikidanselenggara = $baikidanselenggara - 10;
       }
 
       $arraycalculation = ['bds' => $baikidanselenggara, 'perubatan' => $perubatan, 'keraian' => $keraian];
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)