From afd76521a2cf5eb9ebcc7fc92efdf1cdaf67bc01 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 20 Jun 2021 11:28:58 +0800 Subject: [PATCH] fix penebusan upah --- app/Http/Controllers/KhazanahController.php | 224 +---- app/Http/Controllers/LelongController.php | 324 ++++++- resources/views/aliran_tunai/index.blade.php | 52 +- resources/views/customers/info.blade.php | 36 + resources/views/khazanah/dashboard.blade.php | 4 +- .../views/khazanah/laporan/gadaian.blade.php | 100 +- .../khazanah/laporan/penebusan.blade.php | 203 ++-- resources/views/modal/historytebus.blade.php | 18 + .../views/print/laporan_gadaian.blade.php | 17 +- .../views/print/laporan_lejer_am.blade.php | 892 +++++++++--------- .../views/print/laporan_penebusan.blade.php | 35 +- 11 files changed, 999 insertions(+), 906 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 6421595..105678b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2817,38 +2817,17 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - - // dd($request->all()); - - if($request->datemula == null){ - $split_date = explode('-', $request->datehingga); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - + if($request->datetarikh == null){ + $gadai_date = $current->toDateString(); }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $split_date = explode('-',$request->datetarikh); + $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - - if($request->datehingga == null){ - $hingga_date = $request->datemula; - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datemula == null && $request->datehingga == null) - { - $mula_date = $current->toDateString(); - $hingga_date = $current->toDateString(); - } - - // $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json(); - $gadai = Http::get(config('api.url'). '/api/gadailaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date, 'akhir' => $hingga_date])->json(); - + $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_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_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + + return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url')); } public function laporanPenebusan(){ @@ -2859,43 +2838,27 @@ class KhazanahController extends Controller } public function cetakLaporanPenebusan(Request $request){ - // dd($request); - $api_url = config('api.url'); - $auth_user = Auth::user(); - $current = Carbon::now(); - $current = new Carbon(); - $tarikh_cetak = $current->toDateString(); - - if($request->datemula == null){ - $split_date = explode('-', $request->datehingga); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - - }else{ - $split_date = explode('-', $request->datemula); - $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datehingga == null){ - $hingga_date = $request->datemula; - }else{ - $split_date = explode('-', $request->datehingga); - $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - - if($request->datemula == null && $request->datehingga == null) - { - $mula_date = $current->toDateString(); - $hingga_date = $current->toDateString(); - } - - $tebus = Http::get(config('api.url'). '/api/tebuslaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); - $tebuspengasingan = Http::get(config('api.url'). '/api/tebuslaporanjenistawarruqrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); - $upahlama = Http::get(config('api.url'). '/api/advansurdetailsrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_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','mula_date','hingga_date','tebuspengasingan','api_url','upahlama')); + // dd($request); + $api_url = config('api.url'); + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + if($request->datetarikh == null){ + $tebus_date = $current->toDateString(); + }else{ + $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(); + $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(); + + $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')); + } public function laporanLelongan(){ @@ -4321,134 +4284,7 @@ class KhazanahController extends Controller //KIRAAN UNTUK LEJER_AM BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH - $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']; - - $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json(); - - $keterangan=$get_GLCode[0]['descpt']; - $acctype=$get_GLCode[0]['acttype']; - - $total_bayaranOnline=0.0; - - - // $getTotalBayaranOnline=Http::get(config('api.url').'/api/ansuranByrOnline/'.$auth_user['cawangan'])->json(); - // if(sizeof($getTotalBayaranOnline)!=0) - // { - - // $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(); @@ -4456,7 +4292,7 @@ class KhazanahController extends Controller $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')); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index bcf260a..47f0aa5 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -60,6 +60,61 @@ class LelongController extends Controller } + // public function transaksituntutbaki(Request $request){ + + // $auth_user = Auth::user(); + + // $tuntutbaki = Http::post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [ + // 'batchno' => $request->batchno, + // 'jenis' => $request->jenis, + // 'norujukan' => $request->norujukan, + // 'teller' => $request->teller, + // 'bakipjm' => $request->bakipjm, + // 'bakiupah' => $request->bakiupah, + // 'cajlain' => $request->cajlain, + // 'cajlelong' => $request->cajlelong, + // 'jumlah' => $request->jumlah, + // 'nowakil' => $request->nowakil, + // 'hargajual' => $request->hargajual + // ])->json(); + + // $updatetuntutbaki = Http::put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan); + + // $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json(); + + // $keluar = $getTunai2['keluar']; + // $baki = $getTunai2['baki']; + // $masuk = $getTunai2['masuk']; + // $bakiawal = $getTunai2['bakiawal']; + // $pendahuluan = $getTunai2['tambah']; + // $serahan = $getTunai2['kurang']; + + // $bakiakhir = $baki; + + // if($request->jenis == 'T'){ + // $bakiakhir -= $request->jumlah; + // } + // else + // { + // $bakiakhir += -($request->jumlah); + // } + + // //masuk dalam tunai aliran + // $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ + // 'kodlaluan' => $request->teller, + // 'keluar' => $keluar, + // 'masuk' => $masuk, + // 'bakiakhir' => $bakiakhir + // ]); + + // if($updatetuntutbaki) + // { + // return response('Berjaya'); + // }else{ + // return response('Gagal'); + // } + // } + public function transaksituntutbaki(Request $request){ $auth_user = Auth::user(); @@ -90,15 +145,280 @@ class LelongController extends Controller $serahan = $getTunai2['kurang']; $bakiakhir = $baki; + $jumlah_byr=$request->jumlah; - if($request->jenis == 'T'){ + if($request->jenis == 'T') + { $bakiakhir -= $request->jumlah; + + + + $KOD_TUNAI='1000/010'; + $BAKI_LELONG='7000/090'; + + $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); + $hariIni_Tunai=$get_lejerTunai[0]['hariini']; + $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; + $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; + $kredit_Tunai=$get_lejerTunai[0]['kredit']; + $debit_Tunai=$get_lejerTunai[0]['debit']; + $recno_Tunai=$get_lejerTunai[0]['recno']; + + + $kredit_Tunai=$kredit_Tunai+$jumlah_byr; + $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; + $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariIni_Tunai, + 'kelmarin' =>$kelmarin_Tunai, + + ]); + + + $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + $gl_cdetails_bl= $get_KOD_BL[0]; + $keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode + $actype_bl= $get_KOD_BL[0]['acttype']; + + + $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + if(sizeof($get_current_GLejer_Baki_Lelong)==0) + { + $jumlah_bl=0.0; + + $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + if(sizeof($getGLedjer_bl_Semalam)==0) + { + $jumlah_bl=0.0; + } + else + { + + $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah']; + + $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini']; + $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl; + + } + $jumlahBulan_ini_bl=0.0; + $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + if( sizeof($get_GlejerBulan_Tahun_bl)==0) + { + $jumlahBulan_ini_bl=0.0; + } + else + { + + $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah']; + $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl; + + } + + + $Jumlah_TahunIni_bl=0.0; + $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json(); + + if(sizeof($get_Glejer_Tahun_bl)==0) + { + $Jumlah_TahunIni_bl=0.0; + } + else + { + $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah']; + $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl; + + } + + + $HariIni_bl=0.0; + $kelmarin_bl=$jumlah_bl-$HariIni_bl; + $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$BAKI_LELONG, + 'descpt'=>$keterangan_bl, + 'debit'=>$jumlah_byr, + 'kredit'=>0.0, + 'hariini'=>$HariIni_bl, + 'kelmarin'=>$kelmarin_bl, + 'jumlah'=>$jumlah_bl, + 'bulanini'=>$jumlahBulan_ini_bl, + 'tahunini'=>$Jumlah_TahunIni_bl, + 'acttype'=> $actype_bl + + ]); + + + } + else + { + + $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini']; + $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin']; + $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah']; + $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit']; + $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit']; + $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno']; + + $debit_BL=$debit_BL+$jumlah_byr; + $hariIni_Tunai=$debit_BL-$kredit_BL; + $kelmarin_BL=$jumlah_BL-$hariIni_BL; + + $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_BL, + 'debit'=>$debit_BL, + 'kredit'=>$kredit_BL, + 'hariini'=>$hariIni_BL, + 'kelmarin' =>$kelmarin_BL, + + ]); + + } + + + } else { $bakiakhir += -($request->jumlah); - } + + $KOD_TUNAI='1000/010'; + $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json(); + $hariIni_Tunai=$get_lejerTunai[0]['hariini']; + $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin']; + $jumlah_Tunai=$get_lejerTunai[0]['jumlah']; + $kredit_Tunai=$get_lejerTunai[0]['kredit']; + $debit_Tunai=$get_lejerTunai[0]['debit']; + $recno_Tunai=$get_lejerTunai[0]['recno']; + + + $debit_Tunai=$debit_Tunai+$jumlah_byr; + $hariIni_Tunai=$debit_Tunai-$kredit_Tunai; + $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai; + $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_Tunai, + 'debit'=>$debit_Tunai, + 'kredit'=>$kredit_Tunai, + 'hariini'=>$hariIni_Tunai, + 'kelmarin' =>$kelmarin_Tunai, + + ]); + + + + $RUGI_LELONG='3000/020'; + + $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + $gl_cdetails_rl= $get_KOD_RL[0]; + $keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode + $actype_rl= $get_KOD_RL[0]['acttype']; + + + $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + if(sizeof($get_current_GLejer_Rugi_Lelong)==0) + { + $jumlah_rl=0.0; + + $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + if(sizeof($getGLedjer_rl_Semalam)==0) + { + $jumlah_rl=0.0; + } + else + { + + $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah']; + + $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini']; + $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl; + + } + $jumlahBulan_ini_rl=0.0; + $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + if( sizeof($get_GlejerBulan_Tahun_rl)==0) + { + $jumlahBulan_ini_rl=0.0; + } + else + { + + $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah']; + $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl; + + } + + + $Jumlah_TahunIni_rl=0.0; + $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json(); + + if(sizeof($get_Glejer_Tahun_rl)==0) + { + $Jumlah_TahunIni_rl=0.0; + } + else + { + $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah']; + $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl; + + } + + + $HariIni_rl=0.0; + $kelmarin_rl=$jumlah_rl-$HariIni_rl; + $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[ + + 'kodcaw'=>$auth_user['cawangan'], + 'glcode'=>$RUGI_LELONG, + 'descpt'=>$keterangan_rl, + 'debit'=>0.0, + 'kredit'=>$jumlah_byr, + 'hariini'=>$HariIni_rl, + 'kelmarin'=>$kelmarin_rl, + 'jumlah'=>$jumlah_rl, + 'bulanini'=>$jumlahBulan_ini_rl, + 'tahunini'=>$Jumlah_TahunIni_rl, + 'acttype'=> $actype_rl + + ]); + + + } + else + { + + $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini']; + $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin']; + $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah']; + $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit']; + $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit']; + $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno']; + + $kredit_RL=$kredit_RL+$jumlah_byr; + $hariIni_Tunai=$debit_RL-$kredit_RL; + $kelmarin_BL=$jumlah_RL-$hariIni_RL; + + $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ + 'recno'=>$recno_RL, + 'debit'=>$debit_RL, + 'kredit'=>$kredit_RL, + 'hariini'=>$hariIni_RL, + 'kelmarin' =>$kelmarin_RL, + + ]); + + } + + + + } //masuk dalam tunai aliran $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [ 'kodlaluan' => $request->teller, diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index acddf57..021c54b 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -116,7 +116,7 @@
- +
@@ -292,6 +292,56 @@ var tele = "{{ $auth_user['name'] }}"; + function serahankemaskini(data) + { + + $.ajax({ + type: 'get', + url: "{{ route('periksa.alirantunai') }}", + success: function(balasbalik){ + if(balasbalik == 'sama') + { + openuptambahdanserah(data); + }else{ + + $.ajax({ + type: 'get', + url: "{{ route('kemaskini.alirantunai') }}", + data: { "bakiakhir" : balasbalik['bakisemasa'], + "pendahuluan" : balasbalik['pendahuluan'], + "serahan" : balasbalik['serahan'], + "gadaian" : balasbalik['gadaian'], + "penebusan" : balasbalik['penebusan'] + }, + success: function(balas){ + if(balas == 'berjaya') + { + Swal.fire({ + icon: 'success', + title: 'Berjaya', + text: 'Kemaskini Berjaya!', + closeOnClickOutside: false + }).then(function() { + location.reload(); + }); + + }else{ + Swal.fire({ + icon: 'danger', + title: 'Tidak Berjaya', + text: 'Kemaskini tidak berjaya!', + closeOnClickOutside: false + }).then(function() { + location.reload(); + }); + } + } + }); + } + } + }); + } + function periksaalirantunai() { diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 9876021..cc15ea7 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -470,6 +470,10 @@ "ordering": false }); + var bayaranupah = $('#tablehistoryupah').DataTable({ + "ordering": false + }); + const formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -821,6 +825,13 @@ rekodasal(gadai); } }); + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + } + }); } }else if($("input[name='options']:checked").val() == 'sudah_tebus'){ let histid = $('input[name="sudahtebus"]:checked').val(); @@ -858,6 +869,13 @@ rekodasal(gadai); } }); + $.ajax({ + method:'get', + url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid, + success:function(ansuran){ + rekodansuran(ansuran); + } + }); } } } @@ -868,6 +886,24 @@ $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun'])); } + function rekodansuran(data){ + var counter = 1; + + bayaranupah.clear().draw(); + $.each(data,function(index,bayaran){ + + var urlroute = '{{ route("resit.advansur", ":id") }}'; + urlroute = urlroute.replace(':id', bayaran['norujukan']); + bayaranupah.row.add([ + counter, + bayaran['tarikh'], + "RM " + bayaran['upahDibayar'], + 'Cetak' + ]).draw(); + counter = counter + 1; + }); + } + function historybayarantable(data){ var counter = 1; diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 1ab4eb0..314c8bf 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -25,9 +25,9 @@
-
+ {{--
-
+
--}}
{{-- First Column --}} diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 928f37f..61f1da9 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -21,21 +21,14 @@
-
+
@csrf
-
- Mula +
+ Tarikh
- - -
- Hingga -
- - - +
@@ -85,10 +78,7 @@ "ordering": false }); $(document).ready( function () { - $('#datemula').datepicker({ - format: 'dd-mm-yyyy' - }); - $('#datehingga').datepicker({ + $('#datetarikh').datepicker({ format: 'dd-mm-yyyy' }); var current = new Date(); @@ -98,81 +88,22 @@ var today_date = current_year + '-' +current_month+'-'+current_date; $.ajax({ method:'get', - url: api_url + '/api/gadailaporanRange/'+kodcaw, - data:{'mula' : today_date, 'akhir' : today_date }, + url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, success: function(gadai){ - console.log(gadai); gadaitable(gadai); } }); }); - $('#datemula').change(function(){ - //mula + $('#datetarikh').change(function(){ var input_date = this.value; var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - //current time - var hinggainput = $('#datehingga').val(); - - if(hinggainput != '') - { - var input_date = hinggainput; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - }else{ - - var hingga = mula_date; - } - + var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; $.ajax({ method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - gadaitable(panjar); - } - }); - }); - - $('#datehingga').change(function(){ - var input_date = this.value; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - //current time - var mulainput = $('#datemula').val(); - - if(mulainput != '') - { - var input_date = mulainput; - var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - }else{ - - - var dulu_date = hingga_date; - - var mula = dulu_date; - } - - $.ajax({ - method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - gadaitable(panjar); + url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date, + success: function(gadai){ + gadaitable(gadai); } }); }); @@ -190,17 +121,13 @@ tablegadai.clear().draw(); $.each(data,function(index,gadai){ - $.ajax({ - method:'get', - url:api_url + '/api/customers/' + gadai['nokp'], - success:function(customer){ total_pinjaman += Number(gadai['pinjaman']); total_upah12 += Number(gadai['upah12']); total_nm += Number(gadai['nilaimarhun']); total_berat += Number(gadai['berat']); tablegadai.row.add([ counter, - customer['nama'], + gadai['nama'], gadai['nokp'], gadai['norujukan'], formatter.format(gadai['pinjaman']), @@ -213,11 +140,8 @@ $('#nmtotal').text(formatter.format(total_nm.toFixed(2))); $('#berattotal').text(formatter.format(total_berat.toFixed(2))); counter = counter + 1; - } - }); }); } @endsection - diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index 7c8cbf5..79e3f74 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -21,21 +21,15 @@
-
+
@csrf
-
- Mula +
+ Tarikh
- - -
- Hingga -
- - - + +
@@ -47,17 +41,16 @@ Bil - Nama + Nama No K/P No Rujukan - Tarikh Tebus Pembiayaan (RM) Keuntungan (RM) Bayaran (RM) - TOTAL + TOTAL @@ -83,115 +76,41 @@ "ordering": true }); $(document).ready( function () { - $('#datemula').datepicker({ - format: 'dd-mm-yyyy' - }); - $('#datehingga').datepicker({ + $('#datetarikh').datepicker({ format: 'dd-mm-yyyy' }); + var current = new Date(); var current_date = current.getDate(); var current_month = current.getMonth()+1; var current_year = current.getFullYear(); - var today_date = current_year + '-' +current_month+'-'+current_date; + var today_date = current_year + '-' + current_month + '-' + current_date; $.ajax({ method:'get', - url: api_url + '/api/tebuslaporanRange/' + kodcaw, - data:{'mula' : today_date, 'akhir' : today_date }, + url: api_url + '/api/tebus/laporan/' +kodcaw+ '/' + today_date, success: function(tebus){ tebustable(tebus); } }); }); - // $('#datetimepicker1').change(function(){ - // var input_date = this.value; - // var split_date = input_date.split('-'); - // var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - // $.ajax({ - // method:'get', - // url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date, - // success: function(tebus){ - // tebustable(tebus); - // } - // }); - // $('#pinjamantotal').text('0.00'); - // $('#keuntungantotal').text('0.00'); - // $('#bayarantotal').text('0.00'); - - // }); - - $('#datemula').change(function(){ - //mula + $('#datetarikh').change(function(){ var input_date = this.value; var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - //current time - var hinggainput = $('#datehingga').val(); - - if(hinggainput != '') - { - var input_date = hinggainput; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - }else{ - - var hingga = mula_date; - } - + var today_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0]; $.ajax({ method:'get', - url: api_url + '/api/tebuslaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - tebustable(panjar); + url: api_url + '/api/tebus/laporan/' + kodcaw + '/' + today_date, + success: function(tebus){ + tebustable(tebus); } }); + $('#pinjamantotal').text('0.00'); + $('#keuntungantotal').text('0.00'); + $('#bayarantotal').text('0.00'); + }); - $('#datehingga').change(function(){ - var input_date = this.value; - var split_date = input_date.split('-'); - var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var hingga = hingga_date; - - //current time - var mulainput = $('#datemula').val(); - - if(mulainput != '') - { - var input_date = mulainput; - var split_date = input_date.split('-'); - var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; - - var mula = mula_date; - - }else{ - - - var dulu_date = hingga_date; - - var mula = dulu_date; - } - - $.ajax({ - method:'get', - url: api_url + '/api/gadailaporanRange/' + kodcaw, - data:{'mula' : mula, 'akhir' : hingga }, - success: function(panjar){ - tebustable(panjar); - } - }); - }); - - const formatter = new Intl.NumberFormat('en-US', { minimumFractionDigits: 2 }); @@ -201,40 +120,62 @@ var total_pinjaman = 0; var total_keuntungan = 0; var total_bayaran = 0; + + console.log(data); tabletebus.clear().draw(); $.each(data,function(index,tebus){ - $.ajax({ - url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'], - method:'get', - success:function(gadai){ - $.ajax({ - url:api_url + '/api/customers/' + gadai[0][0]['nokp'], - method:'get', - success:function(customer){ - total_pinjaman += parseFloat(tebus['pinjaman']); - total_keuntungan += parseFloat(tebus['bakiupah']); - total_bayaran += parseFloat(tebus['bakipjm']); - tabletebus.row.add([ - counter, - customer['nama'], - gadai[0][0]['nokp'], - tebus['norujukan'], - tebus['t_tebus'], - formatter.format(tebus['pinjaman']), - formatter.format(tebus['bakiupah']), - formatter.format(tebus['bakipjm']) - ]).draw(); - counter = counter + 1; - $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); - $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); - $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); - - } - }); - } - }); + total_pinjaman += parseFloat(tebus['pinjaman']); + total_keuntungan += parseFloat(tebus['bakiupah']); + total_bayaran += parseFloat(tebus['bakipjm']); + tabletebus.row.add([ + counter, + tebus['nama'], + tebus['nokp'], + tebus['norujukan'], + formatter.format(tebus['pinjaman']), + formatter.format(tebus['bakiupah']), + formatter.format(tebus['bakipjm']) + ]).draw(); + counter = counter + 1; + $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); + $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); + $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); }); + + + // $.each(data,function(index,tebus){ + // $.ajax({ + // url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'], + // method:'get', + // success:function(gadai){ + // $.ajax({ + // url:api_url + '/api/customers/' + gadai[0][0]['nokp'], + // method:'get', + // success:function(customer){ + // total_pinjaman += parseFloat(tebus['pinjaman']); + // total_keuntungan += parseFloat(tebus['bakiupah']); + // total_bayaran += parseFloat(tebus['bakipjm']); + // tabletebus.row.add([ + // counter, + // customer['nama'], + // gadai[0][0]['nokp'], + // tebus['norujukan'], + // tebus['t_tebus'], + // formatter.format(tebus['pinjaman']), + // formatter.format(tebus['bakiupah']), + // formatter.format(tebus['bakipjm']) + // ]).draw(); + // counter = counter + 1; + // $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); + // $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2))); + // $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2))); + + // } + // }); + // } + // }); + // }); // console.log('Total Pinjam : ' + total_pinjaman); // $('#jumlah_pinjaman').text('RM '+ total_pinjaman); diff --git a/resources/views/modal/historytebus.blade.php b/resources/views/modal/historytebus.blade.php index 0de2db9..d1c0d8e 100644 --- a/resources/views/modal/historytebus.blade.php +++ b/resources/views/modal/historytebus.blade.php @@ -24,6 +24,9 @@
  • Bayaran
    • +
  • + Upah +
  • Rekod
    • @@ -44,6 +47,21 @@
    +
    +
    + + + + + + + + + + + +
    BilTarikhUpahAction
    +
    diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 79cb00c..addd58a 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -174,15 +174,9 @@ - + - - @@ -241,12 +235,9 @@ - + diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 6ead757..ef6bc18 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -1,452 +1,454 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Tarikh Mula: Tarikh: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp Tarikh Hingga: @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate) @endphp{{ $counter }} {{$item['norujukan']}} - @php - $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json(); - echo $customer_detail['nama']; - @endphp + {{ $item['nama'] }} {{$customer_detail['alamat1']}}{{ $item['alamat1'] }} {{ $item['nokp'] }} {{ $item['masa'] }} {{ number_format($item['berat'],2) }}
    - - - - - - - - - - - - - - - - - -
    -
    - - - -
    LEJER AM
    -
    - - - - - - - - - -
    TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
    - -
    - - + #header td, #customers th { + + padding:4px; + font-size:10px; + } + + #header tr:nth-child(even){background-color: #ffffff;} + + #header tr:hover {background-color: #ddd;} + + #header th { + padding-top: 12px; + padding-bottom: 12px; + text-align: left; + padding:4px; + color:black; + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    - - -@foreach($data as $index=>$var) - - - - -@if($var['hariini'] >0 ) - + + + + + + + + + + + + + + + +
    +
    + + + +
    LEJER AM
    +
    + + + + + + + + + +
    TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
    + +
    + + + + + + @foreach($data as $index=>$var) + + + + + @if($var['totalharini'] >0 ) + + @else + -@else - - - @endif - - -@endforeach - - - - + + @endif + + @endforeach - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    KOD GL KETERANGAN DEBIT KREDITJUMLAH
    {{ $var['glcode']}}{{$var['descpt']}} {{$var['total_debit']}} {{$var['total_kredit']}} {{ + + $var['totalharini'] + }} + + + + + + + ( {{ number_format(abs($var['totalharini']),2)}} ) - - - -( {{ 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 +
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    DISEMAK DISAHKAN
    .................................................................................................................
    \ No newline at end of file + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    DISEMAK DISAHKAN
    .................................................................................................................
    \ No newline at end of file diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 0f84d0e..0fcc15a 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -145,12 +145,6 @@ - - - - - - {{-- --}} @@ -186,26 +180,14 @@ - + - - - - - - - @@ -244,18 +226,11 @@ {{ $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']}} + {{ $item['nama'] }} + {{ $item['nokp'] }} @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']); + $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']); $formattedweddingdate = $myDateTime->format('d-m-Y'); echo($formattedweddingdate); @endphp