From 347aa430d8bf14eeba34c21408a8e0faf3f21b44 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 24 Mar 2021 10:59:16 +0800 Subject: [PATCH] fix latest --- app/Http/Controllers/KhazanahController.php | 251 ++------------ public/js/main.js | 20 +- resources/views/aliran_tunai/index.blade.php | 32 +- .../views/homepage/penilai/home.blade.php | 18 + .../views/khazanah/alirantunai.blade.php | 315 ++++++++++++++---- .../views/khazanah/khazanahserahan.blade.php | 34 +- .../khazanah/laporan/imbangduga.blade.php | 7 +- resources/views/khazanah/menu.blade.php | 8 +- .../views/khazanah/pendahuluan.blade.php | 38 ++- resources/views/penebusan/index.blade.php | 2 +- .../views/print/laporan_imbanduga.blade.php | 12 +- 11 files changed, 387 insertions(+), 350 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 885d312..c8b0ada 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -162,8 +162,14 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); + $harini = Carbon::now(); + $harini = new Carbon; + $arraytunaiharini = []; $arraytunai = []; + $arraygadaitebus = []; + $arraytuntutbaki = []; + $arrayaddtunai = []; $listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get(); @@ -172,15 +178,23 @@ class KhazanahController extends Controller $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json(); + $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls->name])->json(); + $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls->name])->json(); + $addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls->name])->json(); + + array_push($arraygadaitebus,$gadai_tebus); + array_push($arraytuntutbaki,$tuntutbaki); + array_push($addtunai,$addtunai); array_push($arraytunaiharini,$tunai); array_push($arraytunai,$tunaipast); + } $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json(); - return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi')); + return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki')); } public function gadaian() @@ -268,218 +282,6 @@ class KhazanahController extends Controller 'bakiakhir'=>$bakiakhir ]); - - $getTunaigadTeb=Http::get(config('api.url').'/api/getTunaiGadTeb/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json(); - - - $gadai=$getTunaigadTeb['gadai']; - $tebus=$getTunaigadTeb['tebus']; - $tebusT=$tebus+$tebus_detail['pinjaman']; - $upah=$getTunaigadTeb['upah']; - $upahT=$upah+$tebus_detail['bakiupah']; - - - - - $updateTunaiGadTeb=Http::put(config('api.url').'/api/updateTunaiGadteb/'.$auth_user['cawangan'],[ - 'kodlaluan' => $gadai_detail['teller'], - 'gadai'=>$gadai, - 'tebus'=>$tebusT, - 'upah'=>$upahT - ]); - - - $getVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); - $bakiEOD=$getVault[0]['bakieod']; - $bakiAkhir_EOD=$tebus_detail['bakipjm']+$bakiEOD; - - - - - - $updateBakiEod=Http::put(config('api.url').'/api/updateBakiEOD_Vault/'.$auth_user['cawangan'],[ - 'bakieod'=>$bakiAkhir_EOD - ]); - - - //--GLEJER BERMULA UNTUK PENEBUSAN - - - $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']; - - $get_lejerPinj=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json(); - if(sizeof($get_lejerPinj)!=0) - { - - - $hariIni=$get_lejerPinj[0]['hariini']; - $jumlah=$get_lejerPinj[0]['kelmarin']; - $kredit=$get_lejerPinj[0]['kredit']; - $debit=$get_lejerPinj[0]['debit']; - $recno=$get_lejerPinj[0]['recno']; - - - - $kredit=$kredit+$tebus_detail['bakipjm']; - $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'=>$hariIni, - 'kelmarin' =>$Kelmarin, - - ]); - - - } - else - { - - // kalau kosong getglejer - - - } - - - - - - $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json(); - $keterangan=$get_GLCode[0]['descpt']; - $acctype=$get_GLCode[0]['acttype']; - - $get_lejerPinjUpah=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json(); - if(sizeof($get_lejerPinjUpah)!=0) - { - - - - $hariIniU=$get_lejerPinjUpah[0]['hariini']; - $jumlahU=$get_lejerPinjUpah[0]['kelmarin']; - $kreditU=$get_lejerPinjUpah[0]['kredit']; - $debitU=$get_lejerPinjUpah[0]['debit']; - $recnoU=$get_lejerPinjUpah[0]['recno']; - - - $kredit_U=$kreditU+$tebus_detail['bakiupah']; - $hariIniU=$debitU-$kreditU; - $kelmarinU=$jumlahU-$hariIniU; - - - - - - $updateGlejerU=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[ - 'recno'=>$recnoU, - 'debit'=>$debitU, - 'kredit'=>$kreditU, - 'hariini'=>$hariIniU, - 'kelmarin' =>$kelmarinU - - ]); - - - } - else - { - - $jumlah=0.0; $hariIniSemalam=0.0; - $getGlejer_prevUpah=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->json(); - if(sizeof($getGlejer_prevUpah)!=0) - { - - $jumSemalam=$getGlejer_prevUpah[0]['jumlah']; - $hariIniSemalam=$getGlejer_prevUpah[0]['hariini']; - $jumlah=$jumSemalam+$hariIniSemalam; - - } - else - { - - $jumlah=0.0; - }//end getGlejerPrev_Upah - - - - - - - - - $jumlahBulan_ini=0.0; - $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$glcode_UP])->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'=>$glcode_UP])->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-$tebus_detail['bakiupah']; - $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' =>$glcode_UP, - 'descpt' =>$keterangan, - 'debit'=>0.0, - 'kredit'=>0.0, - 'hariini'=>$hariIni, - 'kelmarin'=>$kelmarin, - 'jumlah'=>$jumlah, - 'bulanini'=>$jumlahBulan_ini, - 'tahunini'=>$Jumlah_TahunIni, - 'acttype'=> $acctype - - ]); - - - - - } - - - } // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan; @@ -2274,7 +2076,8 @@ class KhazanahController extends Controller //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - + $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -2282,22 +2085,23 @@ class KhazanahController extends Controller $wtd = Http::get(config('api.url').'/api/WTD/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + + //Terkumpul - $ringkasanterkumpul = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - $ringkasanterkumpul = $ringkasanterkumpul[0]; - - $keseluruhanupahterkumpul = $ringkasanterkumpul['lelongupahsimpan'] + $ringkasanterkumpul['tebus'][0]['upahsimpan'] + $ringkasanterkumpul['advansur'][0]['upahsimpan']; - + $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]); + array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Penghutang Ar-Rahn', 'amaun' => $keuntungan]); - array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Pendahuluan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]); + array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); $totalhartasemasa = 0; foreach($hartasemasa as $index => $hs) @@ -2320,9 +2124,8 @@ class KhazanahController extends Controller array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]); array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); - array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $keseluruhanupahterkumpul]); - - + array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); $totaltanggungansemasa = 0; foreach($tanggungansemasa as $index => $ts) diff --git a/public/js/main.js b/public/js/main.js index 95e38e1..4ded3c4 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -404,6 +404,7 @@ async function openuptambahdanserah(e) } + //Pendahuluan function tambahdanserahanfunc(e) { @@ -416,11 +417,26 @@ function tambahdanserahanfunc(e) let bd1 = Number($('#bundle1').val());let bd5 = Number($('#bundle5').val()); let bd10 = Number($('#bundle10').val());let bd20 = Number($('#bundle20').val());let bd50 = Number($('#bundle50').val());let bd100 = Number($('#bundle100').val());let txtring1 = Number($('#ringgit1').val());let txtring5 = Number($('#ringgit5').val());let txtring10 = Number($('#ringgit10').val());let txtring20 = Number($('#ringgit20').val());let txtring50 = Number($('#ringgit50').val()); let txtring100 = Number($('#ringgit100').val());let txtsen1 = Number($('#sen1').val());let txtsen5 = Number($('#sen5').val());let txtsen10 = Number($('#sen10').val());let txtsen20 = Number($('#sen20').val());let txtsen50 = Number($('#sen50').val()); + var txt = $('#amaunkiraan').val(); + var txt2 = $('#amaundiminta').val(); + + if(txt != txt2) + { + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Amaun yang diminta tidak sama dengan amaun yang dikira!' + }); + + $('#denominasiModal').modal('hide'); + + return false; + } + + if(id == "serahanmodal") { - var txt = $('#amaunkiraan').val(); - $.ajax({ method:"POST", url: api_url + '/api/requestTeller/' + kodcaw, diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 0149d86..ec6eae9 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -255,26 +255,26 @@ function gettable(datala) { - var counter = 1; - tableaddtunai.clear().draw(); + var counter = 1; + tableaddtunai.clear().draw(); - $.each(datala, function(index,arr){ + $.each(datala, function(index,arr){ - var urlroute = "{{ route('pendahuluan.serah', ':no_id') }}"; + var urlroute = "{{ route('pendahuluan.serah', ':no_id') }}"; + + urlroute = urlroute.replace(':no_id', arr['no']); - urlroute = urlroute.replace(':no_id', arr['no']); - - tableaddtunai.row.add([ - counter, - arr['tarikh'], - 'RM ' + formatter.format(arr['tambah']), - 'RM ' + formatter.format(arr['kurang']), - arr['nota'] - ]).draw(); - counter = counter + 1; + tableaddtunai.row.add([ + counter, + arr['tarikh'], + 'RM ' + formatter.format(arr['tambah']), + 'RM ' + formatter.format(arr['kurang']), + arr['nota'] + ]).draw(); + counter = counter + 1; - }); -} + }); + } diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index f5cfb3d..c67ac90 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -162,6 +162,8 @@

Gadaian Belum Serah

+ + @@ -280,6 +282,22 @@ location.reload(); }); + function checkallfunc(){ + + $(':checkbox').each(function() { + this.checked = true; + }); + + } + + function uncheckallfunc(){ + + $(':checkbox').each(function() { + this.checked = false; + }); + + } + function fetchRekodGadaian(){ var tarikh_rekod = $('#tarikh_rekod').val(); if(tarikh_rekod == ''){ diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 87edb06..28519a4 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -41,7 +41,9 @@ {{-- {{ dd($arraytunai) }} --}}
- - - - - - - - - - - - - - @foreach ($arraytunai[$index1] as $tunai) + + +
+ +
+
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
+ + + + + + + + + + + + + + @foreach ($arraytunai[$index1] as $tunai) + + + + + + + + + + + @endforeach + +
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ number_format($tunai['bakiawal'],2) }}{{ number_format($tunai['tambah'],2) }}{{ number_format($tunai['kurang'],2) }}{{ number_format($tunai['keluar'],2) }}{{ number_format($tunai['masuk'],2) }}{{ number_format($tunai['baki'],2) }}
+
+ + + + + + + @if(is_object($arraygadaitebus) || is_array($arraygadaitebus)) + @foreach($arraygadaitebus[$index1] as $gt) + + {{ $loop->iteration }} + {{ $gt['norujukan'] }} + {{ number_format($gt['pinjaman'],2) }} + {{ number_format($gt['nilaimarhun'],2) }} + @php if($gt['jenistebus'] == ''){ + echo '

Gadai

'; + }else{ + echo '

Tebus

'; + } + @endphp + + @endforeach + @endif + + + + + + + + + @else @@ -264,42 +349,125 @@ + -
- - - - - - - - - - - - - - - - {{-- {{ dd($arraytunai) }} --}} - @foreach ($arraytunai[$index1] as $tunai) - {{-- {{ dd($tunai) }} --}} + +
+
+
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
+ + + + + + + + + + + + + + {{-- {{ dd($arraytunai) }} --}} + @foreach ($arraytunai[$index1] as $tunai) + {{-- {{ dd($tunai) }} --}} + + + + + + + + + + + @endforeach + +
bilTarikhBaki Awal TunaiTunai DiterimaTunai DikeluarGadaianTebusanBaki Akhir Tunai
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['tambah'] }}{{ $tunai['kurang'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['baki'] }}
+
+ + + + + + + @if(is_object($arraygadaitebus) || is_array($arraygadaitebus)) + @foreach($arraygadaitebus[$index1] as $gt) + + {{ $loop->iteration }} + {{ $gt['norujukan'] }} + {{ number_format($gt['pinjaman'],2) }} + {{ number_format($gt['nilaimarhun'],2) }} + @php if($gt['jenistebus'] == ''){ + echo '

Gadai

'; + }else{ + echo '

Tebus

'; + } + @endphp + + @endforeach + @endif + + + + + + + + @endif @@ -357,18 +525,23 @@ diff --git a/resources/views/khazanah/khazanahserahan.blade.php b/resources/views/khazanah/khazanahserahan.blade.php index 9ba06e1..f02b334 100644 --- a/resources/views/khazanah/khazanahserahan.blade.php +++ b/resources/views/khazanah/khazanahserahan.blade.php @@ -69,31 +69,31 @@ RM1 - + RM20 - + RM5 - + RM50 - + RM10 - + RM100 - + @@ -129,51 +129,51 @@ RM0.01 - + RM1 - + RM0.05 - + RM5 - + RM0.10 - + RM10 - + RM0.20 - + RM20 - + RM0.50 - + RM50 - + @@ -183,7 +183,7 @@ RM100 - + diff --git a/resources/views/khazanah/laporan/imbangduga.blade.php b/resources/views/khazanah/laporan/imbangduga.blade.php index 2258c23..d5e3817 100644 --- a/resources/views/khazanah/laporan/imbangduga.blade.php +++ b/resources/views/khazanah/laporan/imbangduga.blade.php @@ -76,12 +76,7 @@ -
-
- Bilangan Surat : 3 - Jumlah Pinjaman : RM 3,000.00 -
-
+ diff --git a/resources/views/khazanah/menu.blade.php b/resources/views/khazanah/menu.blade.php index cedf9c4..b40fb3d 100644 --- a/resources/views/khazanah/menu.blade.php +++ b/resources/views/khazanah/menu.blade.php @@ -9,10 +9,10 @@
- Gadai {{ count($gadai) }} - Tebus {{ count($listserah) }} - Pendahuluan {{ $countmodal }} - Serahan {{ $countserahan }} + Gadai {{ count($gadai) }} + Tebus {{ count($listserah) }} + Pendahuluan {{ $countmodal }} + Serahan {{ $countserahan }}
diff --git a/resources/views/khazanah/pendahuluan.blade.php b/resources/views/khazanah/pendahuluan.blade.php index d8f2b00..2d3613e 100644 --- a/resources/views/khazanah/pendahuluan.blade.php +++ b/resources/views/khazanah/pendahuluan.blade.php @@ -20,6 +20,30 @@ +
+
+
+
+ Tarikh Mula +
+ +
+
+ +
+
+
+ Tarikh Hingga +
+ +
+
+ +
+ +
+ +
@@ -30,6 +54,7 @@ + @@ -103,6 +128,12 @@ var kodcaw = "{{ Auth::user()->cawangan }}"; $(document).ready(function(){ + $('#tarikhmula').datepicker({ + format: 'dd-mm-yyyy' + }); + $('#tarikhhingga').datepicker({ + format: 'dd-mm-yyyy' + }); function getData(){ $.ajax({ type: 'get', @@ -113,9 +144,9 @@ }); } getData(); - setInterval(function () { - getData(); - }, 10000); + // setInterval(function () { + // getData(); + // }, 10000); }); @@ -147,6 +178,7 @@ 'RM ' + formatter.format(arr['modal']), 'RM ' + formatter.format(arr['serahan']), arr['tarikh'], + arr['tarikh'], '' ]).draw(); counter = counter + 1; diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 8746307..deacc19 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -325,7 +325,7 @@ bilmarhun(); - var tarikhtawarruq = new Date("2021/01/01"); + var tarikhtawarruq = new Date("2021/02/31"); var tarikhgadai = new Date("{{ $gadai['t_gadai'] }}"); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 876b2b1..35b63ca 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -458,7 +458,7 @@
Modal Serahan TarikhMasa Action
- + @@ -470,8 +470,8 @@ - - + + @@ -499,11 +499,11 @@

Tarikh Laporan {{ ($tarikh_imbangan) ? $tarikh_imbangan : ''}} Tarikh Cetak {{$tarikh_cetak}}
Tarikh Laporan {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} Tarikh Cetak {{$tarikh_cetak}}
Kod GL Keterangan AmaunKeterangan Amaun
- + - - + + @foreach($tanggungansemasa as $index => $liabilities)
TANGGUNGAN SEMASA