diff --git a/app/Events/NotifikasiUbahHapus.php b/app/Events/NotifikasiUbahHapus.php index 897c489..0a27135 100644 --- a/app/Events/NotifikasiUbahHapus.php +++ b/app/Events/NotifikasiUbahHapus.php @@ -11,13 +11,14 @@ class NotifikasiUbahHapus implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $norujukan,$kelulusan,$komen; + public $norujukan,$kelulusan,$komen,$teller; - public function __construct($norujukan,$kelulusan,$komen) + public function __construct($norujukan,$kelulusan,$komen,$teller) { $this->norujukan = $norujukan; $this->kelulusan = $kelulusan; $this->komen = $komen; + $this->teller = $teller; } public function broadcastOn() diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 8d20f27..a755345 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -559,6 +559,7 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $getlulus = Http::get(config('api.url') . '/api/GetLulus/'. $auth_user['cawangan'],['norujukan' => $norujukan])->json(); if($request->khazanah != null) { @@ -572,7 +573,7 @@ class KhazanahController extends Controller if($updatelulus) { - event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus)); + event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$getlulus['teller'])); } }else{ @@ -582,7 +583,7 @@ class KhazanahController extends Controller if($updatelulus) { - event(new NotifikasiUbahHapus($norujukan,"lulus","tiada")); + event(new NotifikasiUbahHapus($norujukan,"lulus","tiada",$getlulus['teller'])); } } } @@ -598,6 +599,8 @@ class KhazanahController extends Controller '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)); @@ -2664,6 +2667,8 @@ class KhazanahController extends Controller $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; + + array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]); array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]); diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 71e36e6..65f21a4 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1282,7 +1282,7 @@ var channel = pusher.subscribe('notice-kelulusan'); channel.bind('my-kelulusan', function(data) { - + console.log(data); if(data.norujukan == norujukan && data.siri == siricreated) {