diff --git a/app/Events/NotifikasiKelulusan.php b/app/Events/NotifikasiKelulusan.php index 9b8b081..3bee030 100644 --- a/app/Events/NotifikasiKelulusan.php +++ b/app/Events/NotifikasiKelulusan.php @@ -11,14 +11,15 @@ class NotifikasiKelulusan implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $norujukan,$kelulusan,$siri,$komen; + public $norujukan,$kelulusan,$siri,$komen,$teller; - public function __construct($norujukan,$kelulusan,$siri,$komen) + public function __construct($norujukan,$kelulusan,$siri,$komen,$teller) { $this->norujukan = $norujukan; $this->kelulusan = $kelulusan; $this->siri = $siri; $this->komen = $komen; + $this->teller = $teller; } public function broadcastOn() diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index bb4af0d..1682a8d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -596,6 +596,7 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "khazanah", + "namakhazanah" => $request->namakhazanah, 'siri' => $request->siri ])->json(); @@ -603,19 +604,22 @@ class KhazanahController extends Controller if($updatelulus) { - event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan)); + event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller'])); } }else{ $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "khazanah", 'siri' => $request->siri, + "namakhazanah" => $request->namakhazanah, "pembatalan" => "batal" ])->json(); + $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + if($updatelulus) { - event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller'])); } } @@ -632,6 +636,7 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "operasi", 'siri' => $request->siri, + 'namaoperasi' => $request->namaoperasi ])->json(); }else{ @@ -639,10 +644,13 @@ class KhazanahController extends Controller $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[ "pengesahan" => "operasi", 'siri' => $request->siri, - "pembatalan" => "batal" + "pembatalan" => "batal", + 'namaoperasi' => $request->namaoperasi ])->json(); - event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller'])); } diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 73f1d57..3bacf97 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -88,24 +88,30 @@ class OperasiController extends Controller { $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[ 'sahkan' => 1, + 'namaoperasi' => $request->namaoperasi, 'siri' => $request->siri ])->json(); + $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + if($updatelulus) { - event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan)); + event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan,$getlulus['teller'])); } } else { $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan,[ 'sahkan' => 2, + 'namaoperasi' => $request->namaoperasi, 'siri' => $request->siri ])->json(); + $getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); + if($updatelulus) { - event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan)); + event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan,$getlulus['teller'])); } } diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 19e27b9..614d2dc 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -851,9 +851,8 @@ var channel = pusher.subscribe('notice-kelulusan'); channel.bind('my-kelulusan', function(data) { - - if(data.norujukan == norujukan && data.siri == siricreated) + if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller) { if(data.kelulusan == 'lulus') { @@ -969,9 +968,7 @@ channel.bind('my-kelulusan', function(data) { // let message = JSON.stringify(data); - // console.log(message); - - if(data.norujukan == norujukan && data.siri == siricreated) + if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller) { if(data.kelulusan == 'lulus') { diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 0e2068e..47009fb 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -264,7 +264,7 @@ async function updatelulus(e) { let api = "{{ config('api.url') }}"; - let kodcaw = " {{ Auth::user()->cawangan }}"; + let kodcaw = "{{ Auth::user()->cawangan }}"; const { value: katalaluan } = await Swal.fire({ title: 'Masukkan Katalaluan Semula', @@ -320,6 +320,7 @@ let norujukan = $(e).data('norujukan'); let pelulus = $(e).data('pelulus'); let siri = $(e).data('siri'); + let namakhazanah = "{{ Auth::user()->name }}"; $.ajax({ method:'put', @@ -329,7 +330,8 @@ "norujukan" : norujukan, "pelulus" : pelulus, "siri" : siri, - 'komen' : komen + 'komen' : komen, + 'namakhazanah' : namakhazanah }, success:function(data){ Swal.fire({ @@ -397,6 +399,7 @@ let norujukan = $(e).data('norujukan'); let pelulus = $(e).data('pelulus'); let siri = $(e).data('siri'); + let namakhazanah = "{{ Auth::user()->name }}"; $.ajax({ method:'put', @@ -407,7 +410,9 @@ "pelulus" : pelulus, "siri" : siri, "komenkelulusan" : komenkelulusan, - "pembatalan" : "batal" + "pembatalan" : "batal", + 'namakhazanah' : namakhazanah + }, success:function(data){ Swal.fire({ diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 3b3e707..3434cd3 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -313,6 +313,7 @@ let norujukan = $(e).data('norujukan'); let cawangankod = $(e).data('kodcaw'); let siri = $(e).data('siri'); + let namaoperasi = "{{ Auth::user()->name }}"; $.ajax({ method:'put', @@ -322,7 +323,8 @@ "norujukan" : norujukan, "kodcaw" : cawangankod, "komenkelulusan" : komenkelulusan, - "siri" : siri + "siri" : siri, + 'namaoperasi' : namaoperasi }, success:function(data){ console.log(data); @@ -391,6 +393,7 @@ let norujukan = $(e).data('norujukan'); let siri = $(e).data('siri'); let cawangankod = $(e).data('kodcaw'); + let namaoperasi = "{{ Auth::user()->name }}"; $.ajax({ method:'put', @@ -401,7 +404,8 @@ "siri" : siri, "kodcaw" : cawangankod, "komenkelulusan" : komenkelulusan, - "pembatalan" : "batal" + "pembatalan" : "batal", + 'namaoperasi' : namaoperasi }, success:function(data){ Swal.fire({