diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d9fe95b..f79e166 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -195,6 +195,7 @@ class KhazanahController extends Controller return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai')); } + public function gadaian() { $auth_user = Auth::user(); @@ -1996,7 +1997,9 @@ class KhazanahController extends Controller array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]); array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); - // array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Penghutang Ar-Rahn', 'amaun' => $keuntungan]); + array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); + array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0]); + array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); 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']]); @@ -2013,8 +2016,9 @@ class KhazanahController extends Controller // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; - // array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Terakru', 'amaun' => $keuntungan]); + 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' => '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']]); @@ -2029,9 +2033,7 @@ class KhazanahController extends Controller $totaltanggungansemasa = 0; foreach($tanggungansemasa as $index => $ts) { - - $totaltanggungansemasa += $ts['amaun']; - + $totaltanggungansemasa += $ts['amaun']; } return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); diff --git a/public/css/main.css b/public/css/main.css index ef99b8a..e9c3b4d 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -2,5 +2,5 @@ width: 290px !important; } .logo-arrahn-header{ - width: 20px; + width: 70px; } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 0352aeb..f542f8e 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -11,8 +11,15 @@ @php $auth_user = Auth::user();@endphp