fix lapfix
This commit is contained in:
@@ -12,10 +12,12 @@ class PendahuluanSerahan implements ShouldBroadcast
|
||||
use Dispatchable, InteractsWithSockets, SerializesModels;
|
||||
|
||||
public $pengesahan;
|
||||
public $cawangan;
|
||||
|
||||
public function __construct($pengesahan)
|
||||
public function __construct($pengesahan,$cawangan)
|
||||
{
|
||||
$this->pengesahan = $pengesahan;
|
||||
$this->cawangan = $cawangan
|
||||
}
|
||||
|
||||
public function broadcastOn()
|
||||
|
||||
@@ -1118,7 +1118,7 @@ class KhazanahController extends Controller
|
||||
|
||||
]);
|
||||
|
||||
event(new PendahuluanSerahan("Lulus"));
|
||||
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
|
||||
|
||||
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
|
||||
'kodlaluan' => $request->teller,
|
||||
@@ -1198,7 +1198,7 @@ class KhazanahController extends Controller
|
||||
|
||||
]);
|
||||
|
||||
event(new PendahuluanSerahan("Lulus"));
|
||||
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
|
||||
|
||||
$updaterequest=Http::put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
|
||||
'kodlaluan' => $request->teller,
|
||||
@@ -2941,7 +2941,7 @@ class KhazanahController extends Controller
|
||||
'kodlaluan'=>$kodlaluan
|
||||
]);
|
||||
|
||||
event(new PendahuluanSerahan("Batal"));
|
||||
event(new PendahuluanSerahan("Batal",$auth_user['cawangan']));
|
||||
|
||||
return response('Berjaya');
|
||||
}
|
||||
|
||||
Vendored
+2
-2
@@ -466,7 +466,7 @@ async function openuptambahdanserah(e)
|
||||
var channel = pusher.subscribe('pendahuluanserahan-notice');
|
||||
channel.bind('penserahan-event', function(data) {
|
||||
|
||||
if(data.pengesahan === 'Lulus')
|
||||
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw)
|
||||
{
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
@@ -631,7 +631,7 @@ function tambahdanserahanfunc(e)
|
||||
channel.bind('penserahan-event', function(data) {
|
||||
// let message = JSON.stringify(data);
|
||||
|
||||
if(data.pengesahan === 'Lulus')
|
||||
if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw)
|
||||
{
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
|
||||
@@ -630,33 +630,20 @@
|
||||
});
|
||||
|
||||
|
||||
//TIME INTERVAL
|
||||
let timerInterval;
|
||||
var channel = pusher.subscribe('status-liked');
|
||||
channel.bind('my-event', function(data) {
|
||||
|
||||
timerInterval = setInterval(function(){
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url: "{{ route('teller.getkelulusan') }}",
|
||||
data: {
|
||||
"norujukan" : norujukan
|
||||
},
|
||||
success:function(data){
|
||||
if(data != 0){
|
||||
clearInterval(timerInterval);
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
title: 'Telah Disahkan'
|
||||
}).then(function(){
|
||||
$("#print_submit_belum_serah").submit();
|
||||
});
|
||||
}
|
||||
},error: function(xhr, status, error) {
|
||||
var err = eval("(" + xhr.responseText + ")");
|
||||
alert(xhr.responseText);
|
||||
}
|
||||
});
|
||||
}, 3000);
|
||||
|
||||
if(cawangan == data.cawangan)
|
||||
{
|
||||
Swal.fire({
|
||||
icon: 'success',
|
||||
title: 'Telah Disahkan'
|
||||
}).then(function(){
|
||||
$("#print_submit_belum_serah").submit();
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}else if (result.dismiss === Swal.DismissReason.cancel) {
|
||||
swalWithBootstrapButtons.fire(
|
||||
|
||||
Reference in New Issue
Block a user