diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index a6d67b7..b355410 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -1455,7 +1455,7 @@ class AliranTunaiController extends Controller
         {
             if($gad['teller'] === Auth::user()->name)
             {
-                if($gad['semakbarcode'] === 'LULUS')
+                if($gad['semakbarcode'] == 'Lulus')
                     $totalgadaibarcodescanned += $gad['pinjaman'];   
             
                 $totalgadai += $gad['pinjaman'];
@@ -1528,7 +1528,7 @@ class AliranTunaiController extends Controller
         {
             return response('sama');
         }else{
-            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($totaltebusbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
+            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
             return response()->json($arraykemaskini);
         }
     }
@@ -1549,8 +1549,8 @@ class AliranTunaiController extends Controller
 
         $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                         'kodlaluan' => $auth_user['name'],   
-                        'keluar'=> $keluar,
-                        'masuk'=> $masuk,
+                        'keluar'=> $request->gadaian,
+                        'masuk'=> $request->penebusan,
                         'bakiakhir'=> $request->bakiakhir
         ]);
 
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index f3828ee..9586863 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -3371,6 +3371,20 @@ class KhazanahController extends Controller
             $totaltunaiditangan = $tunaiditangan;
         }
 
+        $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
+        //1Stop Special Case
+        if($auth_user['cawangan'] === '1STOP')
+        {
+            $jualan1stop = floatval(129857.00);
+            $belian1stop = floatval(122446.50);
+            $utgterkumpulxtra = floatval(6727.10);
+            $rugilelongxtra = floatval(10079.30);
+            $bakilelongxtra = floatval(123.20);
+            $cajlelongxtra = floatval(25.50);
+            $upahsimpanxtra = floatval(4894.40);
+            
+        }
+
         //Terkumpul
         $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
@@ -3388,7 +3402,9 @@ class KhazanahController extends Controller
         if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
         if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
         if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+        if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
 
+        
         $totalhartasemasa = 0;
         foreach($hartasemasa as $index => $hs)
         {
@@ -3411,7 +3427,13 @@ class KhazanahController extends Controller
         if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
         if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
         if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
-        if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+        if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
+        if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
+        if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
+        if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
+        if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
+        if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
+
         
         $totaltanggungansemasa = 0;
         foreach($tanggungansemasa as $index => $ts)
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index e8fbca1..7a4deb2 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -336,9 +336,7 @@
                         });
                     }
                 }
-            }
         });
-
     }
 
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php
index 3b46d1c..a3c84af 100644
--- a/resources/views/modal/pendahuluanserahan.blade.php
+++ b/resources/views/modal/pendahuluanserahan.blade.php
@@ -12,7 +12,7 @@
 
           <div class="text-center mx-auto">
             <input type="radio" name="radwang" id="radiopendahuluanserahan" value="pendahuluan"/><label class="ml-2">Wang Pendahuluan Daripada HQ</label>
-            <input type="radio" name="radwang" id="radiopendahuluanserahan" value="serahan" class="ml-3"/><label class="ml-2">Wang Serahan Daripada HQ</label>
+            <input type="radio" name="radwang" id="radiopendahuluanserahan" value="serahan" class="ml-3"/><label class="ml-2">Wang Serahan Kepada HQ</label>
           </div>
 
           <div class="text-center mx-auto mt-4">