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

fix laporan

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-07-08 16:54:35 +08:00
parent f5b8484cd1 46a6be8613
commit 08262e6807
14 changed files with 200 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/alirantunai.blade.php
+32 -32
View File
@@ -20,14 +20,14 @@
<thead class="thead-dark">
<tr>
<th>Bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th width="60%">Tarikh</th>
<th>C/F</th>
<th>Keluar</th>
<th>Masuk</th>
<th>Baki EOD</th>
<th>Baki Akhir Tunai</th>
<th>Pendahuluan</th>
<th>Serahan</th>
<th>Panjar</th>
<th>B/F</th>
</tr>
</thead>
<tbody>
@@ -35,14 +35,14 @@
@foreach ($petibesi as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['bakieod'] }}</td>
<td>{{ $tunai['bakiakhir'] }}</td>
<td>{{ $tunai['pendahuluan'] }}</td>
<td>{{ $tunai['serahan'] }}</td>
<td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }}</td>
<td>{{ number_format($tunai['bakiawal'],2) }}</td>
<td>{{ number_format($tunai['keluar'],2) }}</td>
<td>{{ number_format($tunai['masuk'],2) }}</td>
<td>{{ number_format($tunai['pendahuluan'],2) }}</td>
<td>{{ number_format($tunai['serahan'],2) }}</td>
<td>{{ number_format($tunai['totpanjar'],2) }}</td>
<td>{{ number_format($tunai['bakiakhir'],2) }}</td>
</tr>
@endforeach
</tbody>
@@ -206,7 +206,7 @@
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<p>Tebusan</p>
<p>Penebusan</p>
</div>
<div class="icon">
</div>
@@ -244,19 +244,19 @@
<tr>
<th>Bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>C/F</th>
<th>Pendahuluan</th>
<th>Serahan</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
<th>Penebusan</th>
<th>B/F</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }}</td>
<td>{{ number_format($tunai['bakiawal'],2) }}</td>
<td>{{ number_format($tunai['tambah'],2) }}</td>
<td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -287,7 +287,7 @@
@foreach($arrayaddtunai[$index1] as $at)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $at['tarikh'] }} </td>
<td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
<td> {{ number_format($at['tambah'],2) }} </td>
<td> {{ number_format($at['kurang'],2) }} </td>
<td> {{ $at['nota'] }} </td>
@@ -348,7 +348,7 @@
@foreach($arraytuntutbaki[$index1] as $tb)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td>
<td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
<td> {{ number_format($tb['cajlelong'],2) }} </td>
<td> {{ number_format($tb['jumlah'],2) }} </td>
<td> @php if($tb['jenis'] == 'T'){
@@ -396,7 +396,7 @@
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
<p>Tunai Diterima</p>
<p>Pendahuluan</p>
</div>
<div class="icon">
</div>
@@ -409,7 +409,7 @@
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
<p>Tunai Dikeluar</p>
<p>Serahan</p>
</div>
<div class="icon">
</div>
@@ -450,7 +450,7 @@
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<p>Tebusan</p>
<p>Penebusan</p>
</div>
<div class="icon">
</div>
@@ -489,19 +489,19 @@
<tr>
<th>Bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>C/F</th>
<th>Pendahuluan</th>
<th>Serahan</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
<th>Penebusan</th>
<th>B/F</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }}</td>
<td>{{ number_format($tunai['bakiawal'],2) }}</td>
<td>{{ number_format($tunai['tambah'],2) }}</td>
<td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -532,7 +532,7 @@
@foreach($arrayaddtunai[$index1] as $at)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $at['tarikh'] }} </td>
<td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
<td> {{ number_format($at['tambah'],2) }} </td>
<td> {{ number_format($at['kurang'],2) }} </td>
<td> {{ $at['nota'] }} </td>
@@ -594,7 +594,7 @@
@foreach($arraytuntutbaki[$index1] as $tb)
<tr>
<td> {{ $loop->iteration }} </td>
<td> {{ $tb['tarikh'] }} </td>
<td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
<td> {{ number_format($tb['cajlelong'],2) }} </td>
<td> {{ number_format($tb['jumlah'],2) }} </td>
<td> @php if($tb['jenis'] == 'T'){
resources/views/khazanah/khazanahserahan.blade.php
+3 -1
View File
@@ -36,7 +36,7 @@
<div class="col-2"> </div>
<div class="col-6">
<button type="button" data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
<input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
<input type="button" id="terima_transaksi" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
<a onclick="triggerbatal();" class="btn btn-danger">Batal</a>
</div>
</div>
@@ -338,6 +338,8 @@
function triggersubmit()
{
$("#terima_transaksi").prop('disabled', true);
$('#form-pendahuluan').trigger('submit');
}
resources/views/khazanah/laporan/datalejer_am.blade.php
+7 -1
View File
@@ -6,7 +6,13 @@
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Data Lejer AM') }}</div>
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
<li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
<li class="breadcrumb-item active" aria-current="page">Lejer Am</li>
</ol>
</nav>
<div class="card-body text-center">
<div class="row form-group">
resources/views/khazanah/laporan/index.blade.php
+5 -3
View File
@@ -35,10 +35,12 @@
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pemodal</a>
</div>
<div class="row">
<a href="{{route('laporan.stokauditbersih')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Bersih </a>
{{-- <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a> --}}
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a>
</div>
<div class="row">
<a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Details</a>
{{-- <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a> --}}
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a>
</div>
</div>
<div class="col-3 mx-1">
@@ -61,7 +63,7 @@
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pelanggan</a>
</div>
<div class="row">
<a href="{{ route('laporan.datalejer_am') }}" class="btn btn-danger btn-lg btn-block mb-3">Lejer Am</a>
<a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3">Lejer Am</a>
</div>
<div class="row">
<a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>
resources/views/khazanah/panjar.blade.php
+78 -8
View File
@@ -155,9 +155,18 @@
var counter = 1;
tablepanjar.clear().draw();
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
today = yyyy + '-' + mm + '-' + dd;
$.each(data,function(index,panjar){
tablepanjar.row.add([
if(today === panjar['tarikh'])
{
tablepanjar.row.add([
counter,
panjar['tarikh'],
panjar['deskripsi'],
@@ -165,7 +174,20 @@
panjar['bayaran'],
'<button onclick="deletepanjar(this);" data-recno="' + panjar['recno'] + '" class="btn btn-danger fas fa-trash-alt"></button>'
]).draw();
counter = counter + 1;
}else{
tablepanjar.row.add([
counter,
panjar['tarikh'],
panjar['deskripsi'],
panjar['kategori'],
panjar['bayaran'],
'<button data-recno="' + panjar['recno'] + '" class="btn btn-secondary fas fa-trash-alt"></button>'
]).draw();
}
counter = counter + 1;
});
@@ -198,11 +220,8 @@
if(data === 'berjaya')
{
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
location.reload();
}else{
Swal.fire(
'Tidak Berjaya!',
@@ -375,7 +394,14 @@ function kiraanpanjar(datakeyin)
function checkformpanjar(formdata)
{
$("#terima_transaksi_keraian").prop('disabled', true);
$("#terima_transaksi_selenggara").prop('disabled', true);
$("#terima_transaksi_belanjaam").prop('disabled', true);
$("#terima_transaksi_perubatan").prop('disabled', true);
$("#terima_transaksi_dapur").prop('disabled', true);
$("#terima_transaksi_pos").prop('disabled', true);
// let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
let baucer = $(formdata).find("[name='baucer']").val();
@@ -462,9 +488,18 @@ function kiraanpanjar(datakeyin)
if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
{
return true;
}else{
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
event.preventDefault();
return;
}
@@ -553,6 +588,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
@@ -584,6 +626,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
$('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -614,6 +663,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
$('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -644,6 +700,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
@@ -675,6 +738,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
// $('#denominasipanjar').on('hidden.bs.modal', function (e) {
resources/views/khazanah/pendahuluanserahanmain.blade.php
+12 -3
View File
@@ -21,7 +21,7 @@
<div class="card-body">
<div class="mt-3 mx-auto">
{{-- @php $date = date('yy-m-d'); @endphp --}}
<table class='table table-hover table-striped table-bordered' id='table-pendahuluanserahan' style="width: 100%;">
<thead class="thead-dark">
<tr>
@@ -29,7 +29,7 @@
<th>Description</th>
<th>Pendahuluan (RM)</th>
<th>Serahan (RM)</th>
<th>Tindakan</th>
{{-- <th>Tindakan</th> --}}
</tr>
</thead>
<tbody>
@@ -39,7 +39,7 @@
<td>{{ $gldetail['descpt'] }}</td>
<td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
<td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
<td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-trash-alt"></button></td>
{{-- @if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-trash-alt"></button></td>@else<td></td> @endif --}}
</tr>
@endforeach
</tbody>
@@ -168,6 +168,7 @@
function functerima()
{
let amaun = $('#amaun').val();
let keterangan = $('#keterangan').val();
let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -222,6 +223,9 @@
$('#pendahuluanserahanModal').modal('hide');
return true;
}else{
$("#terima_transaksi").prop('disabled', false);
event.preventDefault();
return false;
}
@@ -250,6 +254,8 @@
$('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('show');
$("#terima_transaksi").prop('disabled', false);
$('#bundle1').val('');
$('#totalb1').val(0.00);
$('#bundle5').val('');
@@ -267,6 +273,8 @@
function terimapost()
{
$("#terima_transaksi").prop('disabled', true);
let amaun = $('#amaundiminta').val();
let keterangan = $('#keterangan').val();
let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -333,6 +341,7 @@
$('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('hide');
$("#terima_transaksi").prop('disabled', false);
});
}