KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix

Browse Source
This commit is contained in:
fifi97
2021-07-12 10:47:13 +08:00
parent 08262e6807
commit ae7acc13d6
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/NotifikasiUbahHapus.php
+3 -2
View File
@@ -11,13 +11,14 @@ class NotifikasiUbahHapus implements ShouldBroadcast
{ {
use Dispatchable, InteractsWithSockets, SerializesModels; 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->norujukan = $norujukan;
$this->kelulusan = $kelulusan; $this->kelulusan = $kelulusan;
$this->komen = $komen; $this->komen = $komen;
$this->teller = $teller;
} }
public function broadcastOn() public function broadcastOn()
app/Http/Controllers/KhazanahController.php
+7 -2
View File
@@ -559,6 +559,7 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $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) if($request->khazanah != null)
{ {
@@ -572,7 +573,7 @@ class KhazanahController extends Controller
if($updatelulus) if($updatelulus)
{ {
event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus)); event(new NotifikasiUbahHapus($norujukan,"batal",$request->komenubahhapus,$getlulus['teller']));
} }
}else{ }else{
@@ -582,7 +583,7 @@ class KhazanahController extends Controller
if($updatelulus) 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 'siri' => $request->siri
])->json(); ])->json();
$getlulus = Http::get(config('api.url') . '/api/ListLatestLulus/'. $auth_user['cawangan'] . '/' . $norujukan)->json();
if($updatelulus) if($updatelulus)
{ {
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan)); 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']; $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']; $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/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/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]); array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]);
resources/views/penebusan/index.blade.php
+1 -1
View File
@@ -1282,7 +1282,7 @@
var channel = pusher.subscribe('notice-kelulusan'); var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) { channel.bind('my-kelulusan', function(data) {
console.log(data);
if(data.norujukan == norujukan && data.siri == siricreated) if(data.norujukan == norujukan && data.siri == siricreated)
{ {