From fbd060b36f7ac3fbbab678a2734c89c2bacabf09 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Tue, 29 Jun 2021 10:09:33 +0800 Subject: [PATCH 1/8] biasa --- app/Http/Controllers/KhazanahController.php | 288 ++++++++---------- .../khazanah/laporan/datalejer_am.blade.php | 30 +- .../views/khazanah/laporan/index.blade.php | 2 +- .../views/print/laporan_lejer_am.blade.php | 23 +- 4 files changed, 137 insertions(+), 206 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 07abd1c..da029fc 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2389,7 +2389,9 @@ class KhazanahController extends Controller $upahsimpanxtra = $xtra['upahsimpan']; $bakilelongxtra = $xtra['bakilelong']; $utgterkumpulxtra = $xtra['untungrugiterkumpul']; - $rugilelongxtra = -($xtra['kerugianlelong']); + $rugilelongxtra = -($xtra['kerugianlelong']); + $peruntukanhapuskira = ($xtra['phapuskira']); + } //Terkumpul @@ -2409,6 +2411,7 @@ class KhazanahController extends Controller if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); 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]); $totalhartasemasa = 0; @@ -2476,184 +2479,153 @@ class KhazanahController extends Controller public function cetak_lejer_am(Request $request) { - //new glcode 2021-02-22 - $GL_Code_BayaranOnline="1000/210"; - $GL_CodeUntungSebenar="1000/213"; - $GL_CodeHutangArrahn="1000/211"; - $GL_CodeHutangAkru="2000/007"; + //new glcode 2021-02-22 + $GL_Code_BayaranOnline="1000/210"; + $GL_CodeUntungSebenar="1000/213"; + $GL_CodeHutangArrahn="1000/211"; + $GL_CodeHutangAkru="2000/007"; - $auth_user = Auth::user(); - $api_url = config('api.url'); + $auth_user = Auth::user(); + $api_url = config('api.url'); - // dd($tarikh_aging); - $num=$request->num; - $current = Carbon::now(); - $current = new Carbon(); + $num=$request->num; + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datetimepicker1 == null){ $tarikh_cetak = $current->toDateString(); - - if($request->datetimepicker1 == null){ - $tarikh_cetak = $current->toDateString(); - }else - { + }else { $split_date = explode('-',$request->datetimepicker1); $tarikh_mula = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } + } - if($request->datetimepicker2 == null) - { + if($request->datetimepicker2 == null){ $tarikh_cetak = $current->toDateString(); - - } - else - { + } + else{ $split_date = explode('-',$request->datetimepicker2); $tarikh_akhir = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } + } - //KIRAAN UNTUK LEJER_AM BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH + //Calculation Imbang Duga + $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json(); - $glcode=$getProduct[0]['glcode']; - $kodGL=$getProduct[0]['kodgl']; - $glcode_UP=$getProduct[0]['glcode_up']; + //Harta semasa + $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json(); + //Tanggungan Semasa + $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + //TunaiDitangan Sementara Upah + if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') + { + $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); + }else{ + $totaltunaiditangan = $tunaiditangan; + } - $keterangan=$get_GLCode[0]['descpt']; - $acctype=$get_GLCode[0]['acttype']; + $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; + //1Stop Special Case + if($auth_user['cawangan'] === '1STOP') + { + $jualan1stop = floatval(129857.00); + $belian1stop = floatval(122446.50); + $utgterkumpulxtra = floatval(6727.10); + $rugilelongxtra = floatval(10079.30); + $bakilelongxtra = floatval(123.20); + $cajlelongxtra = floatval(25.50); + $upahsimpanxtra = floatval(4894.40); + + }else{ + $upahsimpanxtra = $xtra['upahsimpan']; + $bakilelongxtra = $xtra['bakilelong']; + $utgterkumpulxtra = $xtra['untungrugiterkumpul']; + $rugilelongxtra = -($xtra['kerugianlelong']); + $peruntukanhapuskira = ($xtra['phapuskira']); + } - $total_bayaranOnline=0.0; + //Terkumpul + $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $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($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]); + if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); + if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); + if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); + if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); + 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]); + + $totalhartasemasa = 0; + foreach($hartasemasa as $index => $hs) + { + $totalhartasemasa += $hs['amaun']; + } + + $tanggungansemasa = []; - // $getTotalBayaranOnline=Http::get(config('api.url').'/api/ansuranByrOnline/'.$auth_user['cawangan'])->json(); - // if(sizeof($getTotalBayaranOnline)!=0) - // { + // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; - // $total_bayaranOnline=$getTotalBayaranOnline[0]['cash_in']; + 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($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','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']]); + if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); + if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); + if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + 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($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]); + if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); + if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + 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]); + + $totaltanggungansemasa = 0; + foreach($tanggungansemasa as $index => $ts) + { + $totaltanggungansemasa += $ts['amaun']; + } - // } - // else - // { - - // } - - //START UNTUK GLEJER - - //carian_GLejer untuk Bayaran Online (Update Bayaran) - $getBayarOnline_GL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - $keteranganBayaranOnlie=$getBayarOnline_GL[0]['descpt']; //keterangan glcode - $actypeBayaranOnline=$getBayarOnline_GL[0]['acttype']; //keterangan acctype - - $get_current_GLejer_Details_BayaranOnline=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - if(sizeof($get_current_GLejer_Details_BayaranOnline)==0) - { //start kalau xdak data - $jumlah=0.0; - - $getGLedjer=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - - if(sizeof($getGLedjer)==0) - { - $jumlah=0.0; - } - else - { - - //$glejer=$getGLedjer[0]; - $jumlahSemalam=$getGLedjer[0]['jumlah']; - - $hariIniSemalam=$getGLedjer[0]['hariini']; - $jumlah=$jumlahSemalam+$hariIniSemalam; - - - } - - - - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - - if( sizeof($get_GlejerBulan_Tahun)==0) - { - $jumlahBulan_ini=0.0; - } - else - { - $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah']; - $jumlahBulan_ini=$jumlah-$jumlahBulan_ini; - }//end bulan tahun - $Jumlah_TahunIni=0.0; - $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); - if(sizeof($get_Glejer_Tahun)==0) - { - $Jumlah_TahunIni=0.0; - } - else - { - - - $JumTahunIni=$get_Glejer_Tahun[0]['jumlah']; - $Jumlah_TahunIni=$jumlah-$JumTahunIni; - - } - - $HariIni=0.0; - $kelmarin=$jumlah-$HariIni; - //insert glejer untuk current date /hari ini - $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ - - 'kodcaw' =>$auth_user['cawangan'], - 'glcode' =>$GL_Code_BayaranOnline, - 'descpt' =>$keteranganBayaranOnlie, - 'debit'=>0.0, - 'kredit'=>0.0, - 'hariini'=>$HariIni, - 'kelmarin'=>$kelmarin, - 'jumlah'=>$jumlah, - 'bulanini'=>$jumlahBulan_ini, - 'tahunini'=>$Jumlah_TahunIni, - 'acttype'=> $actypeBayaranOnline - - ]); - - } - else - { - - $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode])->json(); - - if(sizeof($get_lejer)>0) - { - $hariIni=$get_lejer[0]['hariini']; - $jumlah=$get_lejer[0]['kelmarin']; - $kredit=$get_lejer[0]['kredit']; - $debit=$get_lejer[0]['debit']; - $recno=$get_lejer[0]['recno']; - $kredit=$kredit+ $total_bayaranOnline; - $Hari_Ini=$debit-$kredit; - $Kelmarin=$jumlah-$Hari_Ini; - $updateGlejer=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recno, - 'debit'=>$debit, - 'kredit'=>$kredit, - 'hariini'=>$Hari_Ini, - 'kelmarin'=>$Kelmarin, - ]); - - } - - $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); - $cawangan_detail=$cawangan[0]; - $debit=Http::get(config('api.url').'/api/glejer/sumDebit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); - $kredit=Http::get(config('api.url').'/api/glejer/sumKredit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); - $data=Http::get(config('api.url').'/api/glejer/getdata/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json(); - } - - //return view('print.laporan_imbanduga',compact('tarikh_imbangan','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); - return view( 'print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit')); + $untungrugifield = []; + array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); + $totaluntungrugi = 0; + $totaluntungrugi = $totaltanggungansemasa + $untungrugi; + return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit')); } public function laporan_tuntutbaki(Request $request) diff --git a/resources/views/khazanah/laporan/datalejer_am.blade.php b/resources/views/khazanah/laporan/datalejer_am.blade.php index 88de390..64e39ba 100644 --- a/resources/views/khazanah/laporan/datalejer_am.blade.php +++ b/resources/views/khazanah/laporan/datalejer_am.blade.php @@ -33,7 +33,7 @@
-
+
@@ -51,34 +51,6 @@
- - - - -
-
-
-
- - - - - - - - - - - -
BilBil GadaianJumlah Pinjaman (RM)Peratusan %
-
-
-
-
- Bilangan Surat : 3 - Jumlah Pinjaman : RM 3,000.00 -
-
diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 7b8677c..e13ee97 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -61,7 +61,7 @@ Aging Pelanggan
- Lejer Am + Lejer Am
Tuntut Baki diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 6ead757..220b8ea 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -334,7 +334,7 @@ KOD GL KETERANGAN DEBIT KREDITJUMLAH -@foreach($data as $index=>$var) +{{-- @foreach($data as $index=>$var) {{ $var['glcode']}}{{$var['descpt']}} {{$var['debit']}} {{$var['kredit']}} @@ -378,26 +378,13 @@ @endforeach + + + - - - - - - - - - - - - - - - - - + --}} From 17b2b84312ceaa9888299841b071fc84adf82f6b Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 4 Jul 2021 09:00:23 +0800 Subject: [PATCH 2/8] fix lejer am --- app/Http/Controllers/KhazanahController.php | 187 ++++++++++-------- .../views/print/laporan_lejer_am.blade.php | 67 ++----- 2 files changed, 115 insertions(+), 139 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index da029fc..fd8b4c6 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2479,6 +2479,13 @@ class KhazanahController extends Controller public function cetak_lejer_am(Request $request) { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + //new glcode 2021-02-22 $GL_Code_BayaranOnline="1000/210"; $GL_CodeUntungSebenar="1000/213"; @@ -2512,120 +2519,128 @@ class KhazanahController extends Controller //Calculation Imbang Duga $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + #$keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + // $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + // $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + // $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + + // $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + // $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + // $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); //TunaiDitangan Sementara Upah - if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') - { - $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); - }else{ - $totaltunaiditangan = $tunaiditangan; - } + // if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') + // { + // $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + // $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); + // }else{ + // $totaltunaiditangan = $tunaiditangan; + // } - $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; - //1Stop Special Case - if($auth_user['cawangan'] === '1STOP') - { - $jualan1stop = floatval(129857.00); - $belian1stop = floatval(122446.50); - $utgterkumpulxtra = floatval(6727.10); - $rugilelongxtra = floatval(10079.30); - $bakilelongxtra = floatval(123.20); - $cajlelongxtra = floatval(25.50); - $upahsimpanxtra = floatval(4894.40); + // $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; + // //1Stop Special Case + // if($auth_user['cawangan'] === '1STOP') + // { + // $jualan1stop = floatval(129857.00); + // $belian1stop = floatval(122446.50); + // $utgterkumpulxtra = floatval(6727.10); + // $rugilelongxtra = floatval(10079.30); + // $bakilelongxtra = floatval(123.20); + // $cajlelongxtra = floatval(25.50); + // $upahsimpanxtra = floatval(4894.40); - }else{ - $upahsimpanxtra = $xtra['upahsimpan']; - $bakilelongxtra = $xtra['bakilelong']; - $utgterkumpulxtra = $xtra['untungrugiterkumpul']; - $rugilelongxtra = -($xtra['kerugianlelong']); - $peruntukanhapuskira = ($xtra['phapuskira']); - } + // }else{ + // $upahsimpanxtra = $xtra['upahsimpan']; + // $bakilelongxtra = $xtra['bakilelong']; + // $utgterkumpulxtra = $xtra['untungrugiterkumpul']; + // $rugilelongxtra = -($xtra['kerugianlelong']); + // $peruntukanhapuskira = ($xtra['phapuskira']); + // } //Terkumpul - $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + // $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $hartasemasa = []; - // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; + $Debit = []; + // $Debit = ['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($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]); - if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); - if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); - if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); - if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); - 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]); + array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalkeluar']]); + // if($pembiayaantawarruq > 0) array_push($Debit,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); + // // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); + // //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); + // if($keuntungan > 0) array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); + // if($bayaranpendahuluan > 0) array_push($Debit,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); + // if($rebet > 0) array_push($Debit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); + // if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + // if($pinjamandiberi['pinjamankoop'] > 0) array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); + // if($pinjamandiberi['emaspalsu'] > 0) array_push($Debit,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); + // if($imbangduga['pindahkekpkb'] > 0) array_push($Debit,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); + // if($peruntukanhapuskira > 0) array_push($Debit,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]); + // if($belian1stop > 0) array_push($Debit,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); - $totalhartasemasa = 0; - foreach($hartasemasa as $index => $hs) - { - $totalhartasemasa += $hs['amaun']; - } + // $totalhartasemasa = 0; + // foreach($hartasemasa as $index => $hs) + // { + // $totalhartasemasa += $hs['amaun']; + // } - $tanggungansemasa = []; + $Kredit = []; - // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; + // // $Kredit = ['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($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','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']]); - if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); - if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); - if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); - 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($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]); - if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); - if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); - 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]); + array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalmasuk']]); + // if($keuntungan > 0) array_push($Kredit,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); + // if($keuntungansebenar > 0) array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); + // if($rebet > 0) array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); + // if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + // if($panjar['bds'] > 0) array_push($Kredit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); + // if($panjar['perubatan'] > 0) array_push($Kredit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); + // if($panjar['keraian'] > 0) array_push($Kredit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); + // if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + // if($bakilelong['rugilelong'] != 0) array_push($Kredit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); + // if($wtd > 0) array_push($Kredit,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); + // if($cajlelong > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); + // if($untungrugiterkumpul > 0) array_push($Kredit,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + // if($cajperkhidmatan > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); + // if($cajlelongxtra > 0) array_push($Kredit,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); + // if($upahsimpanxtra > 0) array_push($Kredit,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); + // if($bakilelongxtra > 0) array_push($Kredit,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); + // if($rugilelongxtra != 0) array_push($Kredit,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + // if($utgterkumpulxtra > 0) array_push($Kredit,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); + // if($jualan1stop > 0) array_push($Kredit,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); + // if($hapuskira > 0) array_push($Kredit,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); - $totaltanggungansemasa = 0; - foreach($tanggungansemasa as $index => $ts) - { - $totaltanggungansemasa += $ts['amaun']; - } + // $totaltanggungansemasa = 0; + // foreach($tanggungansemasa as $index => $ts) + // { + // $totaltanggungansemasa += $ts['amaun']; + // } - $untungrugifield = []; - array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); + // $untungrugifield = []; + // array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); - $totaluntungrugi = 0; - $totaluntungrugi = $totaltanggungansemasa + $untungrugi; + // $totaluntungrugi = 0; + // $totaluntungrugi = $totaltanggungansemasa + $untungrugi; - return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit')); + return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','Debit','Kredit')); } public function laporan_tuntutbaki(Request $request) diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 220b8ea..c9276a8 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -331,60 +331,21 @@
- - - -{{-- @foreach($data as $index=>$var) - + + + + + + + - - -@if($var['hariini'] >0 ) - -@else - - - @endif - - -@endforeach - - - - - - - - --}} + + + + + + + From e2a37f2335cf596374250ac2094c49f1ac2bc053 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 4 Jul 2021 15:31:55 +0800 Subject: [PATCH 3/8] fix lejeram --- app/Http/Controllers/KhazanahController.php | 60 +++++++++++++------ .../views/print/laporan_lejer_am.blade.php | 54 +++++++++++++---- 2 files changed, 85 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index fd8b4c6..dc0138b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1401,10 +1401,10 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ + if($request->datetarikh == null){ $gadai_date = $current->toDateString(); }else{ - $split_date = explode('-',$request->datetimepicker1); + $split_date = explode('-',$request->datetarikh); $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); @@ -1428,10 +1428,10 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ + if($request->datetarikh == null){ $tebus_date = $current->toDateString(); }else{ - $split_date = explode('-',$request->datetimepicker1); + $split_date = explode('-',$request->datetarikh); $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); @@ -2363,6 +2363,7 @@ class KhazanahController extends Controller $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $xtra = Http::get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + //TunaiDitangan Sementara Upah if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') @@ -2384,6 +2385,7 @@ class KhazanahController extends Controller $bakilelongxtra = floatval(123.20); $cajlelongxtra = floatval(25.50); $upahsimpanxtra = floatval(4894.40); + $peruntukanhapuskira = ($xtra['phapuskira']); }else{ $upahsimpanxtra = $xtra['upahsimpan']; @@ -2391,7 +2393,6 @@ class KhazanahController extends Controller $utgterkumpulxtra = $xtra['untungrugiterkumpul']; $rugilelongxtra = -($xtra['kerugianlelong']); $peruntukanhapuskira = ($xtra['phapuskira']); - } //Terkumpul @@ -2517,9 +2518,9 @@ class KhazanahController extends Controller } //Calculation Imbang Duga - $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - #$keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); //Harta semasa @@ -2578,20 +2579,31 @@ class KhazanahController extends Controller //Terkumpul // $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $Debit = []; + $TotalDebit = 0; + $TotalTunaiDebit = 0; + $TotalTunaiKredit = 0; + + $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian']; + $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan']; + // $Debit = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalkeluar']]); - // if($pembiayaantawarruq > 0) array_push($Debit,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); + 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/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]); + array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]); + array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]); + array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); + array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]); + array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]); + array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]); + // // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); // //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); - // if($keuntungan > 0) array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); // if($bayaranpendahuluan > 0) array_push($Debit,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); // if($rebet > 0) array_push($Debit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - // if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); - // if($pinjamandiberi['pinjamankoop'] > 0) array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); - // if($pinjamandiberi['emaspalsu'] > 0) array_push($Debit,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); // if($imbangduga['pindahkekpkb'] > 0) array_push($Debit,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); // if($peruntukanhapuskira > 0) array_push($Debit,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]); // if($belian1stop > 0) array_push($Debit,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); @@ -2601,16 +2613,28 @@ class KhazanahController extends Controller // { // $totalhartasemasa += $hs['amaun']; // } - + $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian']; + $Kredit = []; + $TotalKredit = 0; // // $Kredit = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; - array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalmasuk']]); + array_push($Kredit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiDebit]); + array_push($Kredit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Tebus']]); + array_push($Kredit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Tebus']]); + array_push($Kredit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan)]); + array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet)]); + array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); + array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); + array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]); + array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + + + $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan']; // if($keuntungan > 0) array_push($Kredit,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); // if($keuntungansebenar > 0) array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); // if($rebet > 0) array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); - // if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); // if($panjar['bds'] > 0) array_push($Kredit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); // if($panjar['perubatan'] > 0) array_push($Kredit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); // if($panjar['keraian'] > 0) array_push($Kredit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); @@ -2640,7 +2664,7 @@ class KhazanahController extends Controller // $totaluntungrugi = 0; // $totaluntungrugi = $totaltanggungansemasa + $untungrugi; - return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','Debit','Kredit')); + return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit')); } public function laporan_tuntutbaki(Request $request) diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index c9276a8..10e7ab8 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -339,22 +339,54 @@ + @foreach($Kredit as $index=>$kred) + @foreach($Debit as $index=>$deb) + @if($kred['glcode'] === $deb['glcode']) + + + + + + + + @endif + @endforeach + @endforeach + +@foreach($Debit as $index=>$deb) + @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019') + + + + + + + + @endif +@endforeach + +@foreach($Kredit as $index=>$kred) + @if($kred['glcode'] == '5000/241' || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102') + + + + + + + + @endif +@endforeach + - - - - - + + + + - - - - - -
KOD GL KETERANGAN DEBIT KREDITJUMLAH
KOD GLKETERANGANDEBITKREDITJUMLAH
{{ $var['glcode']}}{{$var['descpt']}} {{$var['debit']}} {{$var['kredit']}} {{ - - $var['hariini'] - }} - - - - - - -( {{ number_format(abs($var['hariini']),2)}} ) - - - -
JUMLAH: @foreach($debit as $db=>$vr) {{ number_format($vr['totalDebit'],2)}} @endforeach - - @foreach($kredit as $db=>$vr) {{ number_format($vr['totalKredit'],2)}} @endforeach - - -@foreach($kredit as $db=>$vr) -@foreach($debit as $db2=>$vr2) - -{{ number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2) }} -@endforeach - @endforeach - - - - -
KOD GLKETERANGANDEBITKREDITJUMLAH
JUMLAH
{{ $kred['glcode'] }}{{ $kred['descpt'] }}{{ number_format($deb['amaun'],2) }}{{ number_format($kred['amaun'],2) }}@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp
{{ $deb['glcode'] }}{{ $deb['descpt'] }}{{ number_format($deb['amaun'],2) }}{{ number_format(0,2) }}{{ number_format($deb['amaun'],2) }}
{{ $kred['glcode'] }}{{ $kred['descpt'] }}{{ number_format(0,2) }}{{ number_format($kred['amaun'],2) }}{{ number_format(($kred['amaun']*-1),2) }}
KOD GLKETERANGANDEBITKREDITJUMLAHJUMLAH: {{ number_format($TotalDebit,2) }}{{ number_format($TotalKredit,2) }}@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp
+

From 82d370c01e5cb937812ca4eaf18050935686807b Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 5 Jul 2021 16:28:13 +0800 Subject: [PATCH 4/8] fix laporan --- app/Http/Controllers/KhazanahController.php | 3 ++- resources/views/print/laporan_penebusan.blade.php | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index dc0138b..2ad82e5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1437,11 +1437,12 @@ class KhazanahController extends Controller $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); + $ansuran = Http::get(config('api.url'). '/api/ansuransummary/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json(); $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; // dd($gadai); - return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama')); + return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','ansuran','api_url','upahlama')); } public function laporanLelongan(){ diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0fcc15a..ef7621e 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -325,6 +325,13 @@ {{ number_format($upahlama['total'],2) }} Not Applicable + + {{ $upahlama['bil'] }} + Ansuran + {{ number_format($ansuran['totalpendahuluan'],2) }} + {{ number_format($ansuran['totalkeuntungan'],2) }} + Not Applicable + {{--
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
--}} From 065b4920501593c409e7a6d6e81eb6e6d234360b Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Tue, 6 Jul 2021 16:50:03 +0800 Subject: [PATCH 5/8] fix laporan --- .../views/print/laporan_ansuran.blade.php | 68 +++++++++++++------ .../views/print/laporan_penebusan.blade.php | 24 +++---- resources/views/print/laporan_upah.blade.php | 18 +++-- 3 files changed, 64 insertions(+), 46 deletions(-) diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php index 223b3a6..99403f3 100644 --- a/resources/views/print/laporan_ansuran.blade.php +++ b/resources/views/print/laporan_ansuran.blade.php @@ -205,52 +205,78 @@ No K/P Tempoh Baki Pembiayaan (RM) + Bayaran Pemb. (RM) Bayaran (RM) Keuntungan (RM) - @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; @endphp + @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp @foreach($tebus as $index=>$item) - @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan']; @endphp + @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan'];$totalpendahuluan += $item['bayaran_pembiayaan']; @endphp + @if($index > 0) + @if($item['teller'] != $tebus[$index - 1]['teller']) + + Teller : {{ $item['teller'] }} + + @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp + @endif + @else + + Teller : {{ $item['teller'] }} + + @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp + @endif {{ $counter }} {{$item['norujukan']}} - - @php - $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); - $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json(); - - echo $customer_detail['nama']; - @endphp - - {{ $gadai_detail[0][0]['nokp'] }} - {{ $gadai_detail[0][0]['tempoh'] }} - {{ number_format($gadai_detail[0][0]['bakipjm'],2) }} + {{ $item['nama'] }} + {{ $item['nokp'] }} + {{ $item['tempoh'] }} + {{ number_format($item['bakipjm'],2) }} + {{ number_format($item['bayaran_pembiayaan'],2) }} {{ number_format($item['duit_masuk'],2) }} {{ number_format($item['bayaran_keuntungan'],2) }} - @php $counter++; @endphp + @php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp @if($index+1 < sizeof($tebus)) @if($item['teller'] != $tebus[$index + 1]['teller']) {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} - {{ number_format($totalduitmasuk,2) }} - {{ number_format($totalkeuntungan,2) }} + {{ number_format($totalpendhteller,2) }} + {{ number_format($totaldmteller,2) }} + {{ number_format($totalupahteller,2) }} - @php $counter = 0; @endphp + @php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp @endif @else {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} - {{ number_format($totalduitmasuk,2) }} - {{ number_format($totalkeuntungan,2) }} + {{ number_format($totalpendhteller,2) }} + {{ number_format($totaldmteller,2) }} + {{ number_format($totalupahteller,2) }} @endif @endforeach -
-
+

+ + + + + + + + + + + + + +
Bayaran Pemb. (RM)Bayaran (RM)Keuntungan (RM)
JUMLAH KESELURUHAN{{ number_format($totalpendahuluan,2) }}{{ number_format($totalduitmasuk,2) }}{{ number_format($totalkeuntungan,2) }}
+ +

+

diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index ef7621e..2901ae9 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -198,10 +198,10 @@ - - + + @@ -229,21 +229,17 @@ - + @@ -334,8 +330,6 @@
Norujukan Nama No KPT GadaiT TebusMasa JBG J TebusNilai Marhun(RM) Pembiayaan(RM) Upah/Keuntungan(RM) Bayaran(RM){{ $item['nama'] }} {{ $item['nokp'] }} - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate); - @endphp - - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate); + @php + $dt = new DateTime($item['tarikh_bayaran']); + $time = $dt->format('h:i:s'); + echo date($time); @endphp {{ $item['jbg'] }} {{$item['jenistebus']}} + {{ number_format($item['nilaimarhun'],2) }} + {{ number_format($item['pinjaman'],2) }} {{ number_format($item['bakiupah'],2) }} {{ number_format($item['bakipjm'],2) }}
-{{--
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
--}} -

diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php index cfb975b..4c6316b 100644 --- a/resources/views/print/laporan_upah.blade.php +++ b/resources/views/print/laporan_upah.blade.php @@ -221,13 +221,13 @@ - - - + + + @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp @foreach($advansur as $index=>$item) - @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp + @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; @endphp @if($index > 0) @if($item['teller'] != $advansur[$index - 1]['teller']) @@ -242,32 +242,30 @@ @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp @endif - - + @php $counter++; @endphp + @php $totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp @if($index+1 < sizeof($advansur)) @if($item['teller'] != $advansur[$index + 1]['teller']) - + - @php @endphp @endif @else - + - @endif From 9a55bb3587995a49f6ecdafc4908d9083bbd2c25 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 7 Jul 2021 09:14:25 +0800 Subject: [PATCH 6/8] hapus panjar --- app/Http/Controllers/KhazanahController.php | 219 +++++++++++++++++- resources/views/khazanah/panjar.blade.php | 26 ++- .../khazanah/pendahuluanserahanmain.blade.php | 36 ++- 3 files changed, 272 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2ad82e5..b566519 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -798,12 +798,227 @@ class KhazanahController extends Controller $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[ 'totpanjar'=>$request->bayaran - ]); + ]); + + $panjareach = Http::get( config('api.url') .'/api/SenaraiPanjar/listeach/'. $auth_user['cawangan'],['nobaucer' => $request->baucer])->json(); + + $recnopanjar = $panjareach['recno']; + + $rekodsen1 -= intval($request->ambilansen1); + $rekodsen5 -= intval($request->ambilansen5); + $rekodsen10 -= intval($request->ambilansen10); + $rekodsen20 -= intval($request->ambilansen20); + $rekodsen50 -= intval($request->ambilansen50); + + $rekodring1 -= intval($request->ambilanring1); + $rekodring5 -= intval($request->ambilanring5); + $rekodring10 -= intval($request->ambilanring10); + $rekodring20 -= intval($request->ambilanring20); + $rekodring50 -= intval($request->ambilanring50); + $rekodring100 -= intval($request->ambilanring100); + + $denopanjar = Http::post(config('api.url').'/api/requestdenopanjar/'.$auth_user['cawangan'],[ + 'kodlaluan' => $auth_user['name'], + 'serahan' => floatval($request->bayaran), + 'bd1' => 0, + 'bd5' => 0, + 'bd10' => 0, + 'bd20' => 0, + 'bd50' => 0, + 'bd100' => 0, + 'txtring1' => intval($request->ambilanring1), + 'txtring5' => intval($request->ambilanring5), + 'txtring10' => intval($request->ambilanring10), + 'txtring20' => intval($request->ambilanring20), + 'txtring50' => intval($request->ambilanring50), + 'txtring100' => intval($request->ambilanring100), + 'txtring1000' => 0, + 'txtsen1' => intval($request->ambilansen1), + 'txtsen5' => intval($request->ambilansen5), + 'txtsen10' => intval($request->ambilansen10), + 'txtsen20' => intval($request->ambilansen20), + 'txtsen50' => intval($request->ambilansen50), + 'jenis' => $request->jenismodal, + 'recno' => intval($recnopanjar) + ]); + + dd($denopanjar->getStatusCode()); + $upVault = $updateVault->getStatusCode(); + $upDeno = $denominasicreate->getStatusCode(); + $updenopanjar = $denopanjar->getStatusCode(); + + if($upVault == 200 && empty($panjar) == false && $upDeno == 200 && $updenopanjar == 200) + { + if($request->jenismodal === 'perubatan') + { + $listUser=User::where('name','=',$request->tuntutan)->get(); + + $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran); + + $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) + ->where('name','=',$request->tuntutan) + ->update(array( + 'perubatan' => $totalsebenar + )); + } + + return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); + }else{ + return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); + } + + return response($updateVault); + } + + public function deletepanjar(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $bakiperubatan = 0; + + switch ($request->jenismodal) { + case "selenggara": + $kategori = "Baiki dan Selenggara"; + $tag = 2; + break; + case "keraian": + $kategori = "Keraian & Promosi"; + $tag = 3; + break; + case "belanjaam": + $kategori = "Belanja AM"; + $tag = 1; + break; + case "perubatan": + $kategori = "Belanja AM - Perubatan"; + $tag = 1; + break; + case "dapur": + $kategori = "Belanja AM - Barangan Dapur"; + $tag = 1; + break; + case "pos": + $kategori = "Belanja AM - Postage"; + $tag = 1; + break; + } + + $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json(); + + //bundle initialize + $rekodb1 = $denominasilist[0]['bd1']; $rekodb5 = $denominasilist[0]['bd5']; $rekodb10 = $denominasilist[0]['bd10']; $rekodb20 = $denominasilist[0]['bd20']; + $rekodb50 = $denominasilist[0]['bd50']; $rekodb100 = $denominasilist[0]['bd100']; + + //wang Syilling Initialize + $rekodsen1 = $denominasilist[0]['txtsen1']; $rekodsen5 = $denominasilist[0]['txtsen5']; $rekodsen10 = $denominasilist[0]['txtsen10']; + $rekodsen20 = $denominasilist[0]['txtsen20']; $rekodsen50 = $denominasilist[0]['txtsen50']; + + //Wang Ringgit Initialize + $rekodring1 = $denominasilist[0]['txtring1']; $rekodring5 = $denominasilist[0]['txtring5']; $rekodring10 = $denominasilist[0]['txtring10']; + $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100']; + + //Tolok Rekod + $rekodsen1 += intval($request->ambilansen1); + $rekodsen5 += intval($request->ambilansen5); + $rekodsen10 += intval($request->ambilansen10); + $rekodsen20 += intval($request->ambilansen20); + $rekodsen50 += intval($request->ambilansen50); + + $rekodring1 += intval($request->ambilanring1); + $rekodring5 += intval($request->ambilanring5); + $rekodring10 += intval($request->ambilanring10); + $rekodring20 += intval($request->ambilanring20); + $rekodring50 += intval($request->ambilanring50); + $rekodring100 += intval($request->ambilanring100); + + $denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ + 'bd1' => $rekodb1, + 'bd5'=> $rekodb5, + 'bd10'=> $rekodb10, + 'bd20'=> $rekodb20, + 'bd50'=> $rekodb50, + 'bd100'=> $rekodb100, + 'txtring1'=> $rekodring1, + 'txtring5'=> $rekodring5, + 'txtsen1'=> $rekodsen1, + 'txtsen5'=> $rekodsen5, + 'txtsen10'=> $rekodsen10, + 'txtsen20'=> $rekodsen20, + 'txtsen50'=> $rekodsen50, + 'txtring10'=> $rekodring10, + 'txtring20'=> $rekodring20, + 'txtring50'=> $rekodring50, + 'txtring100'=> $rekodring100, + 'txtring1000'=> "0", + 'jumlahbundle'=> "0", + 'txtjumlah'=> "0", + 'jumlahkeping' => "0" + ]); + + $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil); + $tarikhbil = $myDateTime->format('dmY'); + + $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ + 'deskripsi' => $request->deskripsi, + 'bayaran' => $request->bayaran, + 'tag' => $tag, + 'kategori' => $kategori, + 'id' => $auth_user['name'], + 'bakiperubatan' => $bakiperubatan, + 'nobaucer' => $request->baucer, + 'nobil' => $tarikhbil, + 'tuntutoleh' => $request->tuntutan + ])->json(); + + $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[ + 'totpanjar'=>$request->bayaran + ]); + + $rekodsen1 -= intval($request->ambilansen1); + $rekodsen5 -= intval($request->ambilansen5); + $rekodsen10 -= intval($request->ambilansen10); + $rekodsen20 -= intval($request->ambilansen20); + $rekodsen50 -= intval($request->ambilansen50); + + $rekodring1 -= intval($request->ambilanring1); + $rekodring5 -= intval($request->ambilanring5); + $rekodring10 -= intval($request->ambilanring10); + $rekodring20 -= intval($request->ambilanring20); + $rekodring50 -= intval($request->ambilanring50); + $rekodring100 -= intval($request->ambilanring100); + + $denopanjar = Http::post(config('api.url').'/api/requestdenopanjar/'.$auth_user['cawangan'],[ + 'kodlaluan' => $auth_user['name'], + 'serahan' => $request->bayaran, + 'bd1' => 0, + 'bd5' => 0, + 'bd10' => 0, + 'bd20' => 0, + 'bd50' => 0, + 'bd100' => 0, + 'txtring1' => $request->ambilanring1, + 'txtring5' => $request->ambilanring5, + 'txtring10' => $request->ambilanring10, + 'txtring20' => $request->ambilanring20, + 'txtring50' => $request->ambilanring50, + 'txtring100' => $request->ambilanring100, + 'txtring1000' => 0, + 'txtsen1' => $request->ambilansen1, + 'txtsen5' => $request->ambilansen5, + 'txtsen10' => $request->ambilansen10, + 'txtsen20' => $request->ambilansen20, + 'txtsen50' => $request->ambilansen50, + 'jenis' => $request->jenismodal, + 'recno' => $recnopanjar + ]); $upVault = $updateVault->getStatusCode(); $upDeno = $denominasicreate->getStatusCode(); + $updenopanjar = $denopanjar->getStatusCode(); - if($upVault == 200 && empty($panjar) == false && $upDeno == 200) + if($upVault == 200 && empty($panjar) == false && $upDeno == 200 && $updenopanjar == 200) { if($request->jenismodal === 'perubatan') { diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 64ff61a..994eaf8 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -71,6 +71,7 @@ +
Tarikh No Rujukan TellerPinjamanJBGUpah DibayarTempohPembiayaan (RM)Upah Dibayar (RM)
{{ $counter }} {{ $item['tarikh'] }} {{ $item['norujukan'] }} {{ $item['teller'] }}{{ number_format($item['pinjaman'],2) }} {{ $item['jbg'] }}{{ number_format($item['pinjaman'],2) }} {{ number_format($item['upahDibayar'],2) }}
{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} {{ number_format($totalpembiayaanteller,2) }} {{ number_format($totalbayaranteller,2) }}
{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} {{ number_format($totalpembiayaanteller,2) }} {{ number_format($totalbayaranteller,2) }}
deskripsi kategori bayarantindakan
@@ -161,7 +162,8 @@ panjar['tarikh'], panjar['deskripsi'], panjar['kategori'], - panjar['bayaran'] + panjar['bayaran'], + '' ]).draw(); counter = counter + 1; @@ -169,6 +171,28 @@ } + function deletepanjar() + { + Swal.fire({ + title: 'Adakah anda pasti?', + text: "Anda tidak dapat untuk mengembalinya kembali!", + icon: 'warning', + showCancelButton: true, + cancelButtonText: "Batal", + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Teruskan!' + }).then((result) => { + if (result.isConfirmed) { + Swal.fire( + 'Deleted!', + 'Your file has been deleted.', + 'success' + ) + } + }); + } + function caritarikh() { let mula = $('#mula').val(); diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index c99617f..d21f6f3 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -29,16 +29,18 @@ Description Pendahuluan (RM) Serahan (RM) + Tindakan @foreach ($listgldetail as $gldetail) - - {{ $gldetail['tarikh'] }} - {{ $gldetail['descpt'] }} - {{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }} - {{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }} - + + {{ $gldetail['tarikh'] }} + {{ $gldetail['descpt'] }} + {{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }} + {{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }} + + @endforeach @@ -110,6 +112,28 @@ }); + function deletependser() + { + Swal.fire({ + title: 'Adakah anda pasti?', + text: "Anda tidak dapat untuk mengembalinya kembali!", + icon: 'warning', + showCancelButton: true, + cancelButtonText: "Batal", + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Teruskan!' + }).then((result) => { + if (result.isConfirmed) { + Swal.fire( + 'Deleted!', + 'Your file has been deleted.', + 'success' + ) + } + }); + } + function validateformat(evt) { var charCode = (evt.which) ? evt.which : event.keyCode From 40d426b7334a157c16728f50f656e2d2dbc44166 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 7 Jul 2021 16:37:45 +0800 Subject: [PATCH 7/8] laporan fix --- app/Http/Controllers/KhazanahController.php | 69 +++++-------------- .../views/khazanah/laporan/petibesi.blade.php | 6 ++ resources/views/khazanah/panjar.blade.php | 6 +- .../views/print/laporan_penebusan.blade.php | 4 +- .../views/print/laporan_petibesi.blade.php | 4 +- .../print/laporan_ringkasanharian.blade.php | 4 +- .../laporan_ringkasanterkumpulv2.blade.php | 6 +- 7 files changed, 39 insertions(+), 60 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index b566519..a204c0f 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -842,7 +842,6 @@ class KhazanahController extends Controller 'recno' => intval($recnopanjar) ]); - dd($denopanjar->getStatusCode()); $upVault = $updateVault->getStatusCode(); $upDeno = $denominasicreate->getStatusCode(); $updenopanjar = $denopanjar->getStatusCode(); @@ -864,6 +863,7 @@ class KhazanahController extends Controller return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); }else{ + return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); } @@ -876,34 +876,9 @@ class KhazanahController extends Controller $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $bakiperubatan = 0; + + $denopanjar = Http::get( config('api.url') .'/api/requestdenopanjar/get/'. $auth_user['cawangan'],['recno' => $request->recno ])->json(); - switch ($request->jenismodal) { - case "selenggara": - $kategori = "Baiki dan Selenggara"; - $tag = 2; - break; - case "keraian": - $kategori = "Keraian & Promosi"; - $tag = 3; - break; - case "belanjaam": - $kategori = "Belanja AM"; - $tag = 1; - break; - case "perubatan": - $kategori = "Belanja AM - Perubatan"; - $tag = 1; - break; - case "dapur": - $kategori = "Belanja AM - Barangan Dapur"; - $tag = 1; - break; - case "pos": - $kategori = "Belanja AM - Postage"; - $tag = 1; - break; - } $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json(); @@ -920,18 +895,18 @@ class KhazanahController extends Controller $rekodring20 = $denominasilist[0]['txtring20']; $rekodring50 = $denominasilist[0]['txtring50']; $rekodring100 = $denominasilist[0]['txtring100']; //Tolok Rekod - $rekodsen1 += intval($request->ambilansen1); - $rekodsen5 += intval($request->ambilansen5); - $rekodsen10 += intval($request->ambilansen10); - $rekodsen20 += intval($request->ambilansen20); - $rekodsen50 += intval($request->ambilansen50); + $rekodsen1 += intval($denopanjar['txtsen1']); + $rekodsen5 += intval($denopanjar['txtsen5']); + $rekodsen10 += intval($denopanjar['txtsen10']); + $rekodsen20 += intval($denopanjar['txtsen20']); + $rekodsen50 += intval($denopanjar['txtsen50']); - $rekodring1 += intval($request->ambilanring1); - $rekodring5 += intval($request->ambilanring5); - $rekodring10 += intval($request->ambilanring10); - $rekodring20 += intval($request->ambilanring20); - $rekodring50 += intval($request->ambilanring50); - $rekodring100 += intval($request->ambilanring100); + $rekodring1 += intval($denopanjar['txtring1']); + $rekodring5 += intval($denopanjar['txtring5']); + $rekodring10 += intval($denopanjar['txtring10']); + $rekodring20 += intval($denopanjar['txtring20']); + $rekodring50 += intval($denopanjar['txtring50']); + $rekodring100 += intval($denopanjar['txtring100']); $denominasicreate = Http::put(config('api.url').'/api/DenominasiUpdate/'.$auth_user['cawangan'],[ 'bd1' => $rekodb1, @@ -960,20 +935,12 @@ class KhazanahController extends Controller $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil); $tarikhbil = $myDateTime->format('dmY'); - $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ - 'deskripsi' => $request->deskripsi, - 'bayaran' => $request->bayaran, - 'tag' => $tag, - 'kategori' => $kategori, - 'id' => $auth_user['name'], - 'bakiperubatan' => $bakiperubatan, - 'nobaucer' => $request->baucer, - 'nobil' => $tarikhbil, - 'tuntutoleh' => $request->tuntutan + $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[ + 'recno' => $request->recno ])->json(); - $updateVault = Http::put( config('api.url').'/api/UpdateVault/Panjar/'.$auth_user['cawangan'],[ - 'totpanjar'=>$request->bayaran + $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[ + 'totpanjar'=>$$denopanjar['serahan'] ]); $rekodsen1 -= intval($request->ambilansen1); diff --git a/resources/views/khazanah/laporan/petibesi.blade.php b/resources/views/khazanah/laporan/petibesi.blade.php index a9ad8da..0d53d0e 100644 --- a/resources/views/khazanah/laporan/petibesi.blade.php +++ b/resources/views/khazanah/laporan/petibesi.blade.php @@ -44,6 +44,12 @@ var api_url = ""; var kodcaw = ""; + $(document).ready( function () { + $('#datetimepicker1').datepicker({ + format: 'dd-mm-yyyy' + }); + }); + var tablecustomers = $('#myTable').DataTable({ "ordering": false }); diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 994eaf8..c7559dd 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -163,7 +163,7 @@ panjar['deskripsi'], panjar['kategori'], panjar['bayaran'], - '' + '' ]).draw(); counter = counter + 1; @@ -171,8 +171,10 @@ } - function deletepanjar() + function deletepanjar(e) { + let rec_no = $(e).data('recno'); + Swal.fire({ title: 'Adakah anda pasti?', text: "Anda tidak dapat untuk mengembalinya kembali!", diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 2901ae9..22233e7 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -322,8 +322,8 @@ Not Applicable - {{ $upahlama['bil'] }} - Ansuran + {{ $ansuran['bilangan'] }} + Ansuran Pembiayaan {{ number_format($ansuran['totalpendahuluan'],2) }} {{ number_format($ansuran['totalkeuntungan'],2) }} Not Applicable diff --git a/resources/views/print/laporan_petibesi.blade.php b/resources/views/print/laporan_petibesi.blade.php index e104350..ccea30e 100644 --- a/resources/views/print/laporan_petibesi.blade.php +++ b/resources/views/print/laporan_petibesi.blade.php @@ -211,7 +211,7 @@ TOLAK - Serahan Kepada Teller + Pendahuluan Kepada Teller : RM {{ number_format($petibesi['keluar'],2) }} @@ -226,7 +226,7 @@ TAMBAH - Pendahuluan Daripada Teller + Serahan Daripada Teller : RM {{ number_format($petibesi['masuk'],2) }} diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index c156367..f422965 100644 --- a/resources/views/print/laporan_ringkasanharian.blade.php +++ b/resources/views/print/laporan_ringkasanharian.blade.php @@ -191,8 +191,10 @@

G) BAYAR BAKI LELONG

-
RM
+
1. BAKI LELONG
{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}
+
2. RUGI LELONG
+
{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}
diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index f294468..5a1adf5 100644 --- a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php +++ b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php @@ -114,8 +114,10 @@

G) BAYAR BAKI LELONG

-
RM
-
+
1. BAKI LELONG
+
{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}
+
2. RUGI LELONG
+
{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}
From f5b8484cd1f001a0b26e8470be8e6800acaf8b9c Mon Sep 17 00:00:00 2001 From: fifi97 Date: Thu, 8 Jul 2021 10:42:49 +0800 Subject: [PATCH 8/8] fix panjar --- app/Http/Controllers/KhazanahController.php | 81 ++++----------------- resources/views/khazanah/panjar.blade.php | 37 ++++++++-- routes/web.php | 1 + 3 files changed, 46 insertions(+), 73 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index a204c0f..bc03e26 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -876,9 +876,10 @@ class KhazanahController extends Controller $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $denopanjar = Http::get( config('api.url') .'/api/getdenopanjar/'. $auth_user['cawangan'],['recno' => $request->recno])->json(); - $denopanjar = Http::get( config('api.url') .'/api/requestdenopanjar/get/'. $auth_user['cawangan'],['recno' => $request->recno ])->json(); - + if(sizeof($denopanjar) > 0) + $denopanjar = $denopanjar[0]; $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json(); @@ -932,80 +933,24 @@ class KhazanahController extends Controller 'jumlahkeping' => "0" ]); - $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil); - $tarikhbil = $myDateTime->format('dmY'); - $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[ 'recno' => $request->recno ])->json(); $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[ - 'totpanjar'=>$$denopanjar['serahan'] + 'totpanjar'=>$denopanjar['serahan'] ]); - $rekodsen1 -= intval($request->ambilansen1); - $rekodsen5 -= intval($request->ambilansen5); - $rekodsen10 -= intval($request->ambilansen10); - $rekodsen20 -= intval($request->ambilansen20); - $rekodsen50 -= intval($request->ambilansen50); - - $rekodring1 -= intval($request->ambilanring1); - $rekodring5 -= intval($request->ambilanring5); - $rekodring10 -= intval($request->ambilanring10); - $rekodring20 -= intval($request->ambilanring20); - $rekodring50 -= intval($request->ambilanring50); - $rekodring100 -= intval($request->ambilanring100); - - $denopanjar = Http::post(config('api.url').'/api/requestdenopanjar/'.$auth_user['cawangan'],[ - 'kodlaluan' => $auth_user['name'], - 'serahan' => $request->bayaran, - 'bd1' => 0, - 'bd5' => 0, - 'bd10' => 0, - 'bd20' => 0, - 'bd50' => 0, - 'bd100' => 0, - 'txtring1' => $request->ambilanring1, - 'txtring5' => $request->ambilanring5, - 'txtring10' => $request->ambilanring10, - 'txtring20' => $request->ambilanring20, - 'txtring50' => $request->ambilanring50, - 'txtring100' => $request->ambilanring100, - 'txtring1000' => 0, - 'txtsen1' => $request->ambilansen1, - 'txtsen5' => $request->ambilansen5, - 'txtsen10' => $request->ambilansen10, - 'txtsen20' => $request->ambilansen20, - 'txtsen50' => $request->ambilansen50, - 'jenis' => $request->jenismodal, - 'recno' => $recnopanjar - ]); - $upVault = $updateVault->getStatusCode(); $upDeno = $denominasicreate->getStatusCode(); - $updenopanjar = $denopanjar->getStatusCode(); - if($upVault == 200 && empty($panjar) == false && $upDeno == 200 && $updenopanjar == 200) + if($upVault == 200 && $upDeno == 200) { - if($request->jenismodal === 'perubatan') - { - $listUser=User::where('name','=',$request->tuntutan)->get(); - - $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran); - - $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) - ->where('name','=',$request->tuntutan) - ->update(array( - 'perubatan' => $totalsebenar - )); - } - - return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.'); + return 'berjaya'; }else{ - return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.'); + dd($upVault,$upDeno); + return 'gagal'; } - - return response($updateVault); } public function pendahuluan() @@ -2778,10 +2723,10 @@ class KhazanahController extends Controller array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]); array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]); array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); - array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); - array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]); - array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]); - array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]); + if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]); + if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]); + if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]); // // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); // //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); @@ -2811,7 +2756,7 @@ class KhazanahController extends Controller array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]); - array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan']; diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index c7559dd..3efcaaf 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -186,11 +186,38 @@ confirmButtonText: 'Teruskan!' }).then((result) => { if (result.isConfirmed) { - Swal.fire( - 'Deleted!', - 'Your file has been deleted.', - 'success' - ) + + $.ajax({ + method: 'post', + url: '{{ route("khazanah.deletepanjar") }}', + data: { + "_token": "{{ csrf_token() }}", + 'recno' : rec_no + }, + success:function(data){ + + if(data === 'berjaya') + { + Swal.fire( + 'Deleted!', + 'Your file has been deleted.', + 'success' + ) + }else{ + Swal.fire( + 'Tidak Berjaya!', + 'Data tidak berjaya dihapuskan.', + 'error' + ) + } + + } + }); + + + + + } }); } diff --git a/routes/web.php b/routes/web.php index a783457..eb9ecc0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -161,6 +161,7 @@ Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'Khazana Route::get('/mintasemulakelulusan',['as'=>'khazanah.getmintasemulakelulusan','uses'=>'KhazanahController@mintakatalaluansemula'])->middleware('auth','khazanah'); Route::get('/mintasemulakelulusan/operasi',['as'=>'operasi.getmintasemulakelulusan','uses'=>'OperasiController@mintakatalaluansemula'])->middleware('auth','operasi'); Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah'); +Route::post('/deletepanjar',['as'=>'khazanah.deletepanjar','uses'=>'KhazanahController@deletepanjar'])->middleware('auth','khazanah'); Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller'); Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller'); Route::put('/gadai/edit/deletemarhun',['as'=>'gadai.editmarhun','uses'=>'GadaianController@editmarhun'])->middleware('auth','teller');