server

app/Http/Controllers/AliranTunaiController.php

@@ -483,7 +483,7 @@ class AliranTunaiController extends Controller
 
         if(strtoupper(Auth::user()->name) === 'LELONG'){
             $penebusanbarcodescanned = floatval($lelongan);
-            $bakisemasa = floatval($bakiawal) + floatval($lelongan) - floatval($totalserahan);
+            $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($lelongan) - floatval($totalserahan);
         }else{
             $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
         }

resources/views/homepage/penilai/home.blade.php

@@ -281,8 +281,10 @@
     var channel = pusher.subscribe('gadai-notify');
     channel.bind('trigger-gadai', function(data) {
 
-        fetchGadaianEverytime();
-
+	if(cawangan == data.cawangan)
+        {
+	fetchGadaianEverytime();
+	}
     });
 
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({

resources/views/khazanah/gadaian.blade.php

@@ -219,8 +219,9 @@
     var channel = pusher.subscribe('serahanpenilai-notify');
     channel.bind('trigger-serahanpenilai', function(data) {
 
+	if(cawangan == data.kodcaw){
         fetchGadaianEverytime();
-
+	}
     });
 
     $(document).ready(function(){

resources/views/khazanah/tebus.blade.php

@@ -190,8 +190,9 @@
     var channel = pusher.subscribe('tebus-notify');
     channel.bind('trigger-tebus', function(data) {
 
+	if(cawangan == data.cawangan){
         fetchTebusEverytime();
-
+	}
     });
 
     $(document).ready(function(){