From 7e504fcae0d44d09ac693df00394999ae692a760 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 22 Dec 2022 00:42:15 +0800 Subject: [PATCH] fix skit2 --- app/Http/Controllers/AkaunController.php | 35 ++++++++++++++++-------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 00c5bf3..a107d80 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -192,12 +192,15 @@ class AkaunController extends Controller $totaltunaiditangan = $tunaiditangan; } - if($tarikh_imbangan2 >= '2022-11-24' && $request->kodcaw == '010219') + if($request->kodcaw == '010219') { - $totaltunaiditangan = $totaltunaiditangan - 78379.9; - }else{ - $penghutangkaki = $penghutangkaki - 78379.9; - } + if($tarikh_imbangan2 >= '2022-11-24') + { + $totaltunaiditangan = $totaltunaiditangan - 78379.9; + }else{ + $penghutangkaki = $penghutangkaki - 78379.9; + } + } $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; //1Stop Special Case @@ -226,8 +229,8 @@ class AkaunController extends Controller $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); - if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); + if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); + if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/021','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); @@ -261,7 +264,7 @@ class AkaunController extends Controller if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]); if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); - if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if($untungrugiterkumpul != 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); @@ -1042,6 +1045,16 @@ class AkaunController extends Controller $totaltunaiditangan = $tunaiditangan; } + if($request->kodcaw == '010219') + { + if($tarikh_imbangan2 >= '2022-11-24') + { + $totaltunaiditangan = $totaltunaiditangan - 78379.9; + }else{ + $penghutangkaki = $penghutangkaki - 78379.9; + } + } + $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; //1Stop Special Case if($request->kodcaw === '1STOP') @@ -1082,7 +1095,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]); + if($keun_penggadai > 0) array_push($hartasemasa,['glcode' => '8000/502','descpt' => 'Keuntungan Terakru Penggadai', 'amaun' => $keun_penggadai]); $totalhartasemasa = 0; foreach($hartasemasa as $index => $hs) @@ -1106,7 +1119,7 @@ class AkaunController extends Controller if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]); if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); - if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if(($untungrugiterkumpul + $caw_penyelarasan[0]['penyelarasan']) != 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul + $caw_penyelarasan[0]['penyelarasan']]); if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); @@ -1115,7 +1128,7 @@ class AkaunController extends Controller if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); - if($caw_penyelarasan[0]['penyelarasan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Penyelarasan','amaun' => $caw_penyelarasan[0]['penyelarasan']]); + //if($caw_penyelarasan[0]['penyelarasan'] != 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Penyelarasan','amaun' => $caw_penyelarasan[0]['penyelarasan']]); $totaltanggungansemasa = 0;