KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix latest

Browse Source
This commit is contained in:
hafifierahman
2021-03-24 10:59:16 +08:00
parent a9602d49be
commit 347aa430d8
11 changed files with 387 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+27 -224
View File
@@ -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)
public/js/main.js
Vendored
+18 -2
View File
@@ -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,
resources/views/aliran_tunai/index.blade.php
+16 -16
View File
@@ -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;
});
}
});
}
</script>
<script src="{{ asset('js/main.js') }}"></script>
resources/views/homepage/penilai/home.blade.php
+18
View File
@@ -162,6 +162,8 @@
</div>
<div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
<h4>Gadaian Belum Serah</h4>
<button class="btn btn-primary pull-left" onclick="checkallfunc()">Check All</button>
<button class="btn btn-primary pull-left" onclick="uncheckallfunc()">UnCheck All</button>
<table class='table' id='table-gadaian-belum-serah'>
<thead>
<tr>
@@ -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 == ''){
resources/views/khazanah/alirantunai.blade.php
+244 -71
View File
@@ -41,7 +41,9 @@
{{-- {{ dd($arraytunai) }} --}}
<ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
<script> let listu = [];</script>
@foreach($listUser as $index1=>$ls)
<script> listu.push("{{ $ls->id }}"); </script>
@if($index1 == 0)
<li class="nav-item">
@@ -59,7 +61,7 @@
<div class="tab-content" id="pills-tabContent">
@foreach($listUser as $index1=>$ls)
{{-- {{ dd(empty($arraytunai[1])) }} --}}
@if($index1 == 0)
<div class="tab-pane fade show active" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-home-tab">
@@ -145,38 +147,121 @@
</div>
</div>
<div class="mt-3">
<table class='table mt-4' id='table-{{ $ls->id }}' style="width:100%;">
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-history" role="tab" aria-controls="nav-history" aria-selected="true">History Tunai</a>
<a class="nav-item nav-link" id="nav-home-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-addtunai" role="tab" aria-controls="nav-addtunai" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-gt" role="tab" aria-controls="nav-gt" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-tuntutbaki" role="tab" aria-controls="nav-tuntutbaki" aria-selected="false">Tuntut Baki</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
<div class="mt-3">
<div class="tab-pane fade show active" id="nav-{{ $ls->id }}-history" role="tabpanel" aria-labelledby="nav-history-tab">
<table class='table' id='table-{{ $ls->id }}' style="width:100%;">
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ number_format($tunai['bakiawal'],2) }}</td>
<td>{{ number_format($tunai['tambah'],2) }}</td>
<td>{{ number_format($tunai['kurang'],2) }}</td>
<td>{{ number_format($tunai['keluar'],2) }}</td>
<td>{{ number_format($tunai['masuk'],2) }}</td>
<td>{{ number_format($tunai['baki'],2) }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tunai" role="tabpanel" aria-labelledby="nav-tunai-tab">
.....
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="nav-gt-tab">
<table class="table text-center" id="tablegadaitebus-{{ $ls->id }}">
<thead>
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pinjaman (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Jenis Transaksi</th>
</tr>
@endforeach
</tbody>
</table>
</div>
</thead>
<tbody>
@if(is_object($arraygadaitebus) || is_array($arraygadaitebus))
@foreach($arraygadaitebus[$index1] as $gt)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td>
<td> {{ number_format($gt['pinjaman'],2) }} </td>
<td> {{ number_format($gt['nilaimarhun'],2) }} </td>
<td> @php if($gt['jenistebus'] == ''){
echo '<h4><span class="badge badge-success">Gadai</span></h4>';
}else{
echo '<h4><span class="badge badge-danger">Tebus</span></h4>';
}
@endphp </td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="nav-tuntutbaki-tab">
<table class="table text-center" id="tabletuntutbaki-{{ $ls->id }}">
<thead>
<tr>
<th>Bil</th>
<th>Tarikh</th>
<th>Caj Lelong (RM)</th>
<th>Jumlah (RM)</th>
<th>Jenis</th>
</tr>
</thead>
<tbody>
@if(is_object($arraytuntutbaki) || is_array($arraytuntutbaki))
@foreach($arraytuntutbaki[$index1] as $tb)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td>
<td> {{ number_format($tb['cajlelong'],2) }} </td>
<td> {{ number_format($tb['jumlah'],2) }} </td>
<td> @php if($tb['jenis'] == 'T'){
echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>';
}else{
echo '<h4><span class="badge badge-danger">Rugi Lelong</span></h4>';
}
@endphp </td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
@else
@@ -264,42 +349,125 @@
</div>
</div>
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-history-tab-{{ $ls->id }}" data-toggle="tab" href="#nav-{{$ls->id}}-history" role="tab" aria-controls="nav-history-{{ $ls->id }}" aria-selected="true">History Tunai</a>
<a class="nav-item nav-link" id="nav-tunai-tab-{{ $ls->id }}" data-toggle="tab" href="#nav-{{$ls->id}}-tunai" role="tab" aria-controls="nav-tunai-{{ $ls->id }}" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-gt-tab-{{ $ls->id }}" data-toggle="tab" href="#nav-{{$ls->id}}-gt" role="tab" aria-controls="nav-gt-{{ $ls->id }}" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-tuntutbaki-tab-{{ $ls->id }}" data-toggle="tab" href="#nav-{{$ls->id}}-tuntutbaki" role="tab" aria-controls="nav-tuntutbaki-{{ $ls->id }}" aria-selected="false">Tuntut Baki</a>
</div>
</nav>
<div class="mt-3">
<table class='table mt-4' id='table-{{ $ls->id }}'>
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
{{-- {{ dd($arraytunai) }} --}}
@foreach ($arraytunai[$index1] as $tunai)
{{-- {{ dd($tunai) }} --}}
<div class="tab-content" id="nav-tabContent">
<div class="mt-3">
<div class="tab-pane fade show active" id="nav-{{$ls->id}}-history" role="tabpanel" aria-labelledby="nav-history-tab-{{ $ls->id }}">
<table class='table mt-4' id='table-{{ $ls->id }}'>
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
{{-- {{ dd($arraytunai) }} --}}
@foreach ($arraytunai[$index1] as $tunai)
{{-- {{ dd($tunai) }} --}}
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tunai" role="tabpanel" aria-labelledby="nav-tunai-tab-{{ $ls->id }}">
.....
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="nav-gt-tab-{{ $ls->id }}">
<table class="table text-center mt-4" id="tablegadaitebus-{{ $ls->id }}">
<thead>
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
<th>Bil</th>
<th>No Rujukan</th>
<th>Pinjaman (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Jenis Transaksi</th>
</tr>
@endforeach
</tbody>
</table>
</div>
</thead>
<tbody>
@if(is_object($arraygadaitebus) || is_array($arraygadaitebus))
@foreach($arraygadaitebus[$index1] as $gt)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $gt['norujukan'] }} </td>
<td> {{ number_format($gt['pinjaman'],2) }} </td>
<td> {{ number_format($gt['nilaimarhun'],2) }} </td>
<td> @php if($gt['jenistebus'] == ''){
echo '<h4><span class="badge badge-success">Gadai</span></h4>';
}else{
echo '<h4><span class="badge badge-danger">Tebus</span></h4>';
}
@endphp </td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="nav-tuntutbaki-tab-{{ $ls->id }}">
<table class="table text-center" id="tabletuntutbaki-{{ $ls->id }}">
<thead>
<tr>
<th>Bil</th>
<th>Tarikh</th>
<th>Caj Lelong (RM)</th>
<th>Jumlah (RM)</th>
<th>Jenis</th>
</tr>
</thead>
<tbody>
@if(is_object($arraytuntutbaki) || is_array($arraytuntutbaki))
@foreach($arraytuntutbaki[$index1] as $tb)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td>
<td> {{ $tb['cajlelong'] }} </td>
<td> {{ $tb['jumlah'] }} </td>
<td> @php if($tb['jenis'] == 'T'){
echo '<h4><span class="badge badge-success">Baki Lelong</span></h4>';
}else{
echo '<h4><span class="badge badge-danger">Rugi Lelong</span></h4>';
}
@endphp </td>
</tr>
@endforeach
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
@endif
@@ -357,18 +525,23 @@
</div>
<script>
// var tablecapaian = $('#table-tunai').DataTable({
// "scrollX": true
// });
$(document).ready(function() {
$(listu).each(function(index,element) {
var tabletunai = $('#table-' + element).DataTable({
});
var tablegadaitebus = $('#tablegadaitebus-' + element).DataTable({
});
var tabletuntutbaki = $('#tabletuntutbaki-' + element).DataTable({
});
});
var tablecapaian = $('#table-PetiBesi').DataTable({
});
let namefordatatable = "{{ $listUser }}";
console.log(namefordatatable);
console.log(JSON.parse(namefordatatable));
});
</script>
resources/views/khazanah/khazanahserahan.blade.php
+17 -17
View File
@@ -69,31 +69,31 @@
<tr>
<td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['0']['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" value="{{ $array_reqteller['bd1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" value="{{ $array_reqteller['bd1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['0']['b1'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['0']['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" value="{{ $array_reqteller['bd20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" value="{{ $array_reqteller['bd20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['0']['b20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['0']['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" value="{{ $array_reqteller['bd5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" value="{{ $array_reqteller['bd5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['0']['b5'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['0']['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" value="{{ $array_reqteller['bd50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" value="{{ $array_reqteller['bd50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['0']['b50'] }} " readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['0']['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" value="{{ $array_reqteller['bd10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" value="{{ $array_reqteller['bd10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['0']['b10'] }}" readonly/> </td>
<td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['0']['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" value="{{ $array_reqteller['bd100'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" value="{{ $array_reqteller['bd100'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['0']['b100'] }}" readonly/> </td>
</tr>
</table>
@@ -129,51 +129,51 @@
<td>RM0.01</td>
<td><input type="text" name="rekodsen1" class="form-control" value="{{ $denominasi['0']['txtsen1'] }}" readonly/></td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" value="{{ $array_reqteller['txtsen1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen1" class="form-control" value="{{ $denominasi['0']['k01'] }}" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="rekodring1" class="form-control" value="{{ $denominasi['0']['txtring1'] }}" readonly/></td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" value="{{ $array_reqteller['txtring1'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring1" class="form-control" value="{{ $denominasi['0']['k1'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="rekodsen5" class="form-control" value=" {{ $denominasi['0']['txtsen5'] }}" readonly/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" value="{{ $array_reqteller['txtsen5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen5" class="form-control" value=" {{ $denominasi['0']['k05'] }}" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="rekodring5" class="form-control" value=" {{ $denominasi['0']['txtring5'] }}" readonly/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" value="{{ $array_reqteller['txtring5'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring5" class="form-control" value=" {{ $denominasi['0']['k5'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="rekodsen10" class="form-control" value=" {{ $denominasi['0']['txtsen10'] }}" readonly/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" value="{{ $array_reqteller['txtsen10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen10" class="form-control" value=" {{ $denominasi['0']['k010'] }}" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="rekodring10" class="form-control" value=" {{ $denominasi['0']['txtring10'] }}" readonly/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" value="{{ $array_reqteller['txtring10'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring10" class="form-control" value=" {{ $denominasi['0']['k10'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="rekodsen20" class="form-control" value=" {{ $denominasi['0']['txtsen20'] }}" readonly/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" value="{{ $array_reqteller['txtsen20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen20" class="form-control" value=" {{ $denominasi['0']['k020'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodring20" class="form-control" value=" {{ $denominasi['0']['txtring20'] }}" readonly/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" value="{{ $array_reqteller['txtring20'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring20" class="form-control" value=" {{ $denominasi['0']['k20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="rekodsen50" class="form-control" value=" {{ $denominasi['0']['txtsen50'] }}" readonly/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" value="{{ $array_reqteller['txtsen50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalsen50" class="form-control" value=" {{ $denominasi['0']['k050'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodring50" class="form-control" value=" {{ $denominasi['0']['txtring50'] }}" readonly/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" value="{{ $array_reqteller['txtring50'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring50" class="form-control" value=" {{ $denominasi['0']['k50'] }}" readonly/> </td>
</tr>
<tr>
@@ -183,7 +183,7 @@
<td></td>
<td>RM100 </td>
<td><input type="text" name="rekodring100" class="form-control" value=" {{ $denominasi['0']['txtring100'] }}" readonly/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" data-jenis="serahan"value="{{ $array_reqteller['txtring100'] }}" readonly onkeyup="totalkeyserahan(this)"/> </td>
<td><input type="text" name="totalring100" class="form-control" value=" {{ $denominasi['0']['k100'] }}" readonly/> </td>
</tr>
</table>
resources/views/khazanah/laporan/imbangduga.blade.php
+1 -6
View File
@@ -76,12 +76,7 @@
</table>
</div>
</div>
<div class="row">
<div class="col-md-12 text-right">
Bilangan Surat : <span id="bilangan_surat">3</span>
Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
</div>
</div>
</div>
</div>
</div>
resources/views/khazanah/menu.blade.php
+4 -4
View File
@@ -9,10 +9,10 @@
<div class="card-body text-center mx-auto">
<a href="{{ url('khazanahgadaian') }}" class="btn btn-info ml-2">Gadai <span class="badge badge-light">{{ count($gadai) }}</span></a>
<a href="{{ url('khazanahtebus') }}" class="btn btn-info ml-2">Tebus <span class="badge badge-light">{{ count($listserah) }}</span></a>
<a href="{{ url('pendahuluan') }}" class="btn btn-info ml-2">Pendahuluan <span class="badge badge-light">{{ $countmodal }}</span></a>
<a href="{{ url('serahan') }}" class="btn btn-info ml-2">Serahan <span class="badge badge-light">{{ $countserahan }}</span></a>
<a href="{{ url('khazanahgadaian') }}" class="btn btn-info ml-2 btn-lg btn-block">Gadai <span class="badge badge-light">{{ count($gadai) }}</span></a>
<a href="{{ url('khazanahtebus') }}" class="btn btn-info ml-2 btn-lg btn-block">Tebus <span class="badge badge-light">{{ count($listserah) }}</span></a>
<a href="{{ url('pendahuluan') }}" class="btn btn-info ml-2 btn-lg btn-block">Pendahuluan <span class="badge badge-light">{{ $countmodal }}</span></a>
<a href="{{ url('serahan') }}" class="btn btn-info ml-2 btn-lg btn-block">Serahan <span class="badge badge-light">{{ $countserahan }}</span></a>
</div>
</div>
</div>
resources/views/khazanah/pendahuluan.blade.php
+35 -3
View File
@@ -20,6 +20,30 @@
</div>
</div>
<div class="row">
<div class="col-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh Mula</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="tarikhmula" name="tarikhmula" aria-describedby="basic-addon1">
</div>
</div>
<div class="col-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh Hingga</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="tarikhhingga" name="tarikhhingga" aria-describedby="basic-addon1">
</div>
</div>
<div class="col-4">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Hantar">
</div>
</div>
<table class='table mt-4' id='table-pendahuluan' style="width:100%;">
<thead>
@@ -30,6 +54,7 @@
<th>Modal</th>
<th>Serahan</th>
<th>Tarikh</th>
<th>Masa</th>
<th>Action</th>
</thead>
@@ -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'],
'<a href='+ urlroute + ' class="btn btn-info"><span class="fas fa-plus"></span></a>'
]).draw();
counter = counter + 1;
resources/views/penebusan/index.blade.php
+1 -1
View File
@@ -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'] }}");
resources/views/print/laporan_imbanduga.blade.php
+6 -6
View File
@@ -458,7 +458,7 @@
<table id="tarikh_ib">
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan) ? $tarikh_imbangan : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
<tr><td style="width:10px" ><b>Tarikh Laporan</b></td ><td style="width:20px"> {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} </td><td style="width:18px" ><b>Tarikh Cetak</b></td><td style="width:25px" > {{$tarikh_cetak}} </td> </tr>
@@ -470,8 +470,8 @@
<tr>
<th width="20%"> Kod GL </th>
<th colspan="1">Keterangan </th>
<th>Amaun</th>
<th colspan="1" width="60%">Keterangan </th>
<th width="20%">Amaun</th>
</tr>
<tr>
@@ -499,11 +499,11 @@
<br>
<br>
<table id="GL_dtl">
<tr>
<th width="20%"><b> TANGGUNGAN SEMASA</b> </th>
<th></th>
<th></th>
<th width="60%"></th>
<th width="20%"></th>
</tr>
@foreach($tanggungansemasa as $index => $liabilities)