diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 3b9093e..8d20f27 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -798,12 +798,55 @@ 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) + ]); $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') { @@ -820,12 +863,96 @@ class KhazanahController extends Controller 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(); + + $denopanjar = Http::get( config('api.url') .'/api/getdenopanjar/'. $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(); + + //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($denopanjar['txtsen1']); + $rekodsen5 += intval($denopanjar['txtsen5']); + $rekodsen10 += intval($denopanjar['txtsen10']); + $rekodsen20 += intval($denopanjar['txtsen20']); + $rekodsen50 += intval($denopanjar['txtsen50']); + + $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, + '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" + ]); + + $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'] + ]); + + $upVault = $updateVault->getStatusCode(); + $upDeno = $denominasicreate->getStatusCode(); + + if($upVault == 200 && $upDeno == 200) + { + return 'berjaya'; + }else{ + dd($upVault,$upDeno); + return 'gagal'; + } + } + public function pendahuluan() { $auth_user = Auth::user(); @@ -1437,11 +1564,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(){ @@ -2363,6 +2491,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,14 +2513,14 @@ class KhazanahController extends Controller $bakilelongxtra = floatval(123.20); $cajlelongxtra = floatval(25.50); $upahsimpanxtra = floatval(4894.40); - $peruntukanhapuskira = ($xtra['phapuskira']); + $peruntukanhapuskira = ($xtra['phapuskira']); }else{ $upahsimpanxtra = $xtra['upahsimpan']; $bakilelongxtra = $xtra['bakilelong']; $utgterkumpulxtra = $xtra['untungrugiterkumpul']; - $rugilelongxtra = -($xtra['kerugianlelong']); - $peruntukanhapuskira = ($xtra['phapuskira']); + $rugilelongxtra = -($xtra['kerugianlelong']); + $peruntukanhapuskira = ($xtra['phapuskira']); } //Terkumpul @@ -2479,184 +2608,94 @@ 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"; + $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]; + $auth_user = Auth::user(); + $api_url = config('api.url'); - $auth_user = Auth::user(); - $api_url = config('api.url'); + $num=$request->num; + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); - // dd($tarikh_aging); - $num=$request->num; - $current = Carbon::now(); - $current = new Carbon(); + 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/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(); + $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(); + $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(); + $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $keterangan=$get_GLCode[0]['descpt']; - $acctype=$get_GLCode[0]['acttype']; + $Debit = []; + $TotalDebit = 0; + $TotalTunaiDebit = 0; + $TotalTunaiKredit = 0; - $total_bayaranOnline=0.0; + $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; + $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; + + 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]); + 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($bakilelong['rugilelong'] != 0) array_push($Debit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); - // $getTotalBayaranOnline=Http::get(config('api.url').'/api/ansuranByrOnline/'.$auth_user['cawangan'])->json(); - // if(sizeof($getTotalBayaranOnline)!=0) - // { + $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; - // $total_bayaranOnline=$getTotalBayaranOnline[0]['cash_in']; - - // } - // 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')); + $Kredit = []; + $TotalKredit = 0; + 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]); + if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; + + 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/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 9a00108..44da7f9 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -20,14 +20,14 @@ Bil - Tarikh - Baki Awal Tunai + Tarikh + C/F Keluar Masuk - Baki EOD - Baki Akhir Tunai Pendahuluan Serahan + Panjar + B/F @@ -35,14 +35,14 @@ @foreach ($petibesi as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} - {{ $tunai['bakiawal'] }} - {{ $tunai['keluar'] }} - {{ $tunai['masuk'] }} - {{ $tunai['bakieod'] }} - {{ $tunai['bakiakhir'] }} - {{ $tunai['pendahuluan'] }} - {{ $tunai['serahan'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} + {{ number_format($tunai['bakiawal'],2) }} + {{ number_format($tunai['keluar'],2) }} + {{ number_format($tunai['masuk'],2) }} + {{ number_format($tunai['pendahuluan'],2) }} + {{ number_format($tunai['serahan'],2) }} + {{ number_format($tunai['totpanjar'],2) }} + {{ number_format($tunai['bakiakhir'],2) }} @endforeach @@ -206,7 +206,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
-

Tebusan

+

Penebusan

@@ -244,19 +244,19 @@ Bil Tarikh - Baki Awal Tunai - Tunai Diterima - Tunai Dikeluar + C/F + Pendahuluan + Serahan Gadaian - Tebusan - Baki Akhir Tunai + Penebusan + B/F @foreach ($arraytunai[$index1] as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} {{ number_format($tunai['bakiawal'],2) }} {{ number_format($tunai['tambah'],2) }} {{ number_format($tunai['kurang'],2) }} @@ -287,7 +287,7 @@ @foreach($arrayaddtunai[$index1] as $at) {{ $loop->iteration }} - {{ $at['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} {{ number_format($at['tambah'],2) }} {{ number_format($at['kurang'],2) }} {{ $at['nota'] }} @@ -348,7 +348,7 @@ @foreach($arraytuntutbaki[$index1] as $tb) {{ $loop->iteration }} - {{ $tb['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} {{ number_format($tb['cajlelong'],2) }} {{ number_format($tb['jumlah'],2) }} @php if($tb['jenis'] == 'T'){ @@ -396,7 +396,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
-

Tunai Diterima

+

Pendahuluan

@@ -409,7 +409,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
-

Tunai Dikeluar

+

Serahan

@@ -450,7 +450,7 @@
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
-

Tebusan

+

Penebusan

@@ -489,19 +489,19 @@ Bil Tarikh - Baki Awal Tunai - Tunai Diterima - Tunai Dikeluar + C/F + Pendahuluan + Serahan Gadaian - Tebusan - Baki Akhir Tunai + Penebusan + B/F @foreach ($arraytunai[$index1] as $tunai) {{ $loop->iteration }} - {{ $tunai['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }} {{ number_format($tunai['bakiawal'],2) }} {{ number_format($tunai['tambah'],2) }} {{ number_format($tunai['kurang'],2) }} @@ -532,7 +532,7 @@ @foreach($arrayaddtunai[$index1] as $at) {{ $loop->iteration }} - {{ $at['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} {{ number_format($at['tambah'],2) }} {{ number_format($at['kurang'],2) }} {{ $at['nota'] }} @@ -594,7 +594,7 @@ @foreach($arraytuntutbaki[$index1] as $tb) {{ $loop->iteration }} - {{ $tb['tarikh'] }} + {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} {{ number_format($tb['cajlelong'],2) }} {{ number_format($tb['jumlah'],2) }} @php if($tb['jenis'] == 'T'){ diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php index 8bc75d3..b26365a 100644 --- a/resources/views/khazanah/khazanahserahan.blade.php +++ b/resources/views/khazanah/khazanahserahan.blade.php @@ -36,7 +36,7 @@
- + Batal
@@ -338,6 +338,8 @@ function triggersubmit() { + $("#terima_transaksi").prop('disabled', true); + $('#form-pendahuluan').trigger('submit'); } diff --git a/resources/views/khazanah/laporan/datalejer_am.blade.php b/resources/views/khazanah/laporan/datalejer_am.blade.php index 88de390..932e121 100644 --- a/resources/views/khazanah/laporan/datalejer_am.blade.php +++ b/resources/views/khazanah/laporan/datalejer_am.blade.php @@ -6,7 +6,13 @@
-
{{ __('Data Lejer AM') }}
+
@@ -33,7 +39,7 @@
-
+
@@ -51,34 +57,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..dc83920 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -35,10 +35,12 @@ Aging Pemodal
- Stok Audit Bersih + {{-- Stok Audit Bersih --}} + Stok Audit Bersih
- Stok Audit Details + {{-- Stok Audit Details --}} + Stok Audit Details
@@ -61,7 +63,7 @@ Aging Pelanggan
- Lejer Am + Lejer Am
Tuntut Baki 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 64ff61a..4024ff6 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -71,6 +71,7 @@ deskripsi kategori bayaran + tindakan @@ -154,21 +155,92 @@ var counter = 1; tablepanjar.clear().draw(); + var today = new Date(); + var dd = String(today.getDate()).padStart(2, '0'); + var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0! + var yyyy = today.getFullYear(); + + today = yyyy + '-' + mm + '-' + dd; + $.each(data,function(index,panjar){ - tablepanjar.row.add([ + if(today === panjar['tarikh']) + { + tablepanjar.row.add([ counter, panjar['tarikh'], panjar['deskripsi'], panjar['kategori'], - panjar['bayaran'] + panjar['bayaran'], + '' ]).draw(); - counter = counter + 1; + }else{ + tablepanjar.row.add([ + counter, + panjar['tarikh'], + panjar['deskripsi'], + panjar['kategori'], + panjar['bayaran'], + '' + ]).draw(); + } + + counter = counter + 1; + + }); } + function deletepanjar(e) + { + let rec_no = $(e).data('recno'); + + 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) { + + $.ajax({ + method: 'post', + url: '{{ route("khazanah.deletepanjar") }}', + data: { + "_token": "{{ csrf_token() }}", + 'recno' : rec_no + }, + success:function(data){ + + if(data === 'berjaya') + { + location.reload(); + + }else{ + Swal.fire( + 'Tidak Berjaya!', + 'Data tidak berjaya dihapuskan.', + 'error' + ) + } + + } + }); + + + + + + } + }); + } + function caritarikh() { let mula = $('#mula').val(); @@ -322,7 +394,14 @@ function kiraanpanjar(datakeyin) function checkformpanjar(formdata) { - + $("#terima_transaksi_keraian").prop('disabled', true); + $("#terima_transaksi_selenggara").prop('disabled', true); + $("#terima_transaksi_belanjaam").prop('disabled', true); + $("#terima_transaksi_perubatan").prop('disabled', true); + $("#terima_transaksi_dapur").prop('disabled', true); + $("#terima_transaksi_pos").prop('disabled', true); + + // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan; let baucer = $(formdata).find("[name='baucer']").val(); @@ -409,9 +488,18 @@ function kiraanpanjar(datakeyin) if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true) { + + return true; }else{ + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + event.preventDefault(); return; } @@ -500,6 +588,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); @@ -531,6 +626,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); $('#BelanjaamModal').on('hidden.bs.modal', function (e) { @@ -561,6 +663,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); $('#PerubatanModal').on('hidden.bs.modal', function (e) { @@ -591,6 +700,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); @@ -622,6 +738,13 @@ function kiraanpanjar(datakeyin) $(this).find("[name='errorbayaran']").hide(); $(this).find("[name='bayaran']").removeClass('is-invalid'); $(this).find("[name='bayaran']").parent().addClass("mb-4"); + $("#terima_transaksi_keraian").prop('disabled', false); + $("#terima_transaksi_selenggara").prop('disabled', false); + $("#terima_transaksi_belanjaam").prop('disabled', false); + $("#terima_transaksi_perubatan").prop('disabled', false); + $("#terima_transaksi_dapur").prop('disabled', false); + $("#terima_transaksi_pos").prop('disabled', false); + }); // $('#denominasipanjar').on('hidden.bs.modal', function (e) { diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index c99617f..77aa83f 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -21,7 +21,7 @@
- + {{-- @php $date = date('yy-m-d'); @endphp --}} @@ -29,16 +29,18 @@ + {{-- --}} @foreach ($listgldetail as $gldetail) - - - - - - + + + + + + {{-- @if($date === $gldetail['tarikh']) @else @endif --}} + @endforeach
Description Pendahuluan (RM) Serahan (RM)Tindakan
{{ $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) }}
@@ -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 @@ -144,6 +168,7 @@ function functerima() { + let amaun = $('#amaun').val(); let keterangan = $('#keterangan').val(); let jenis = $('#radiopendahuluanserahan:checked').val(); @@ -198,6 +223,9 @@ $('#pendahuluanserahanModal').modal('hide'); return true; }else{ + + $("#terima_transaksi").prop('disabled', false); + event.preventDefault(); return false; } @@ -226,6 +254,8 @@ $('#denominasiHQModal').modal('hide'); $('#pendahuluanserahanModal').modal('show'); + $("#terima_transaksi").prop('disabled', false); + $('#bundle1').val(''); $('#totalb1').val(0.00); $('#bundle5').val(''); @@ -243,6 +273,8 @@ function terimapost() { + $("#terima_transaksi").prop('disabled', true); + let amaun = $('#amaundiminta').val(); let keterangan = $('#keterangan').val(); let jenis = $('#radiopendahuluanserahan:checked').val(); @@ -309,6 +341,7 @@ $('#denominasiHQModal').modal('hide'); $('#pendahuluanserahanModal').modal('hide'); + $("#terima_transaksi").prop('disabled', false); }); } diff --git a/resources/views/modal/panjar.blade.php b/resources/views/modal/panjar.blade.php index 651c408..e0ea373 100644 --- a/resources/views/modal/panjar.blade.php +++ b/resources/views/modal/panjar.blade.php @@ -81,7 +81,7 @@
- +
@@ -171,7 +171,7 @@
- +
@@ -262,7 +262,7 @@
- +
@@ -354,7 +354,7 @@
- +
@@ -444,7 +444,7 @@
- +
@@ -523,7 +523,7 @@
- +
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index aa519f0..f6a5277 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -45,7 +45,7 @@
- +
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_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 6ead757..10e7ab8 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -331,82 +331,62 @@
- - - -@foreach($data as $index=>$var) - + + + + + + + - - -@if($var['hariini'] >0 ) - -@else - - - @endif - - -@endforeach - - - - + + + + + + + @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 + @foreach($Kredit as $index=>$kred) + @foreach($Debit as $index=>$deb) + @if($kred['glcode'] === $deb['glcode']) +
{{ $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) }}
JUMLAH: {{ number_format($TotalDebit,2) }}{{ number_format($TotalKredit,2) }}@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp
+

diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0fcc15a..22233e7 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -198,10 +198,10 @@ Norujukan Nama No KP - T Gadai - T Tebus + Masa JBG J Tebus + Nilai Marhun(RM) Pembiayaan(RM) Upah/Keuntungan(RM) Bayaran(RM) @@ -229,21 +229,17 @@ {{ $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) }} @@ -325,10 +321,15 @@ {{ number_format($upahlama['total'],2) }} Not Applicable + + {{ $ansuran['bilangan'] }} + Ansuran Pembiayaan + {{ number_format($ansuran['totalpendahuluan'],2) }} + {{ number_format($ansuran['totalkeuntungan'],2) }} + Not Applicable + -{{--
JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}
--}} -

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 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index c156367..01b23c6 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) }}
@@ -214,6 +216,7 @@ + @@ -223,6 +226,7 @@ + @@ -230,6 +234,7 @@ + @@ -237,6 +242,7 @@ +
TOLAK
Serahan Kepada TellerPendahuluan Kepada Teller : RM {{ number_format($petibesi['keluar'],2) }}
TAMBAH
Pendahuluan Daripada TellerSerahan Daripada Teller : RM {{ number_format($petibesi['masuk'],2) }}
70% 75% 80%JUMLAH
{{ 'RM '. number_format($laporan['gadai_70'],2) }} {{ 'RM '. number_format($laporan['gadai_75'],2) }} {{ 'RM '. number_format($laporan['gadai_80'],2) }}{{ 'RM '. number_format($laporan['total_gadaian'],2) }}
2{{ 'RM '. number_format($laporan['nilaimarhun_70'],2) }} {{ 'RM '. number_format($laporan['nilaimarhun_75'],2) }} {{ 'RM '. number_format($laporan['nilaimarhun_80'],2) }}{{ 'RM '. number_format($laporan['total_nm'],2) }}
3{{ $laporan['bilangan_70'] }} {{ $laporan['bilangan_75'] }} {{ $laporan['bilangan_80'] }}{{ number_format($laporan['total_bilangan']) }}
diff --git a/resources/views/print/laporan_ringkasanterkumpulv2.blade.php b/resources/views/print/laporan_ringkasanterkumpulv2.blade.php index f294468..97f8312 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_ringkasan['bayar_baki_lelong'],2) }}
+
2. RUGI LELONG
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}
@@ -137,6 +139,7 @@ 70% 75% 80% + JUMLAH @@ -146,6 +149,7 @@ RM {{ number_format($laporan_ringkasan['gadai_70'],2) }} RM {{ number_format($laporan_ringkasan['gadai_75'],2) }} RM {{ number_format($laporan_ringkasan['gadai_80'],2) }} + RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }} 2 @@ -153,6 +157,7 @@ RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }} RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }} RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }} + RM {{ number_format($laporan_ringkasan['total_nm'],2) }} 3 @@ -160,6 +165,7 @@ {{ $laporan_ringkasan['bilangan_70'] }} {{ $laporan_ringkasan['bilangan_75'] }} {{ $laporan_ringkasan['bilangan_80'] }} + {{ number_format($laporan_ringkasan['total_bilangan']) }} 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 @@ Tarikh No Rujukan Teller - Pinjaman - JBG - Upah Dibayar + Tempoh + Pembiayaan (RM) + Upah Dibayar (RM) @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 - {{ $counter }} {{ $item['tarikh'] }} {{ $item['norujukan'] }} {{ $item['teller'] }} - {{ number_format($item['pinjaman'],2) }} {{ $item['jbg'] }} + {{ number_format($item['pinjaman'],2) }} {{ number_format($item['upahDibayar'],2) }} @php $counter++; @endphp + @php $totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp @if($index+1 < sizeof($advansur)) @if($item['teller'] != $advansur[$index + 1]['teller']) - {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} {{ number_format($totalpembiayaanteller,2) }} - {{ number_format($totalbayaranteller,2) }} @php @endphp @endif @else - {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} {{ number_format($totalpembiayaanteller,2) }} - {{ number_format($totalbayaranteller,2) }} @endif diff --git a/routes/web.php b/routes/web.php index b6ec2e8..173471b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -154,6 +154,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');