diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 309c6ec..57eaa27 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1022,10 +1022,7 @@ class AkaunController extends Controller $keun_sebenar = Http::get($request->hostname.'/admin/ig/keuntungansebenar',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); $pend_terakru = Http::get($request->hostname.'/admin/ig/pendapatanterakru',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); $keun_penggadai = Http::get($request->hostname.'/api/KeuntunganPenggadai/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); - - - dd($keun_sebenar,$pend_terakru,$keun_penggadai); - + //TunaiDitangan Sementara Upah if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') { @@ -1075,6 +1072,7 @@ class AkaunController extends Controller if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]); if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); + if($keun_penggadai > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Keuntungan Terakru Penggadai', 'amaun' => $keun_penggadai]); $totalhartasemasa = 0; foreach($hartasemasa as $index => $hs) @@ -1087,7 +1085,8 @@ class AkaunController 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]; // if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); - if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); + if($pend_terakru > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Pendapatan Terakru','amaun' => $pend_terakru]); + // if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); // if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet 2','amaun' => ($rebet * -1)]); if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'Panjar - Baiki dan Selenggara','amaun' => -$panjar['bds']]); @@ -1114,7 +1113,7 @@ class AkaunController extends Controller } $untungrugifield = []; - array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $untungrugi]); + array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $keun_sebenar]); $totaluntungrugi = 0; @@ -1124,10 +1123,10 @@ class AkaunController extends Controller { if($request->jenis == 'pdf') { - $pdf = PDF::loadView('akaun.laporan_imbanduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'))->setPaper('a4', 'potrait'); + $pdf = PDF::loadView('akaun.laporan_imbangduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'))->setPaper('a4', 'potrait'); return $pdf->download('laporan_imbangduga_' . $request->kodcaw .'_'. $tarikh_imbangan2 . '.pdf'); }else{ - return view('akaun.laporan_imbanduga=extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + return view('akaun.laporan_imbangduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); } }