diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index dc9d85d..137d17b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1972,6 +1972,7 @@ class KhazanahController extends Controller //Calculation Imbang Duga $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahn/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $rebet = Http::get(config('api.url').'/api/RebetCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -2002,7 +2003,7 @@ class KhazanahController extends Controller array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); - array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); + array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); @@ -2020,7 +2021,7 @@ class KhazanahController extends Controller array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]); - array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); + array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); @@ -2039,7 +2040,6 @@ class KhazanahController extends Controller } $untungrugifield = []; - $untungrugi = 0; array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 5898b6a..8bfdfbb 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -475,7 +475,7 @@ JUMLAH - {{ number_format($totalhartasemasa,2) }} + {{ number_format($totalhartasemasa,2) }} @@ -523,7 +523,7 @@ JUMLAH - {{ number_format($totaluntungrugi,2) }} + {{ number_format($totaluntungrugi,2) }}