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

resolve conflict

Browse Source
This commit is contained in:
afiq
2021-08-06 09:34:49 +08:00
parent 9c88047218 27fa6fea0b
commit ecaa6a7357
66 changed files with 2234 additions and 4384 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/info.blade.php
+59 -17
View File
@@ -324,9 +324,12 @@
<div class='col-md-8'>
@php
$poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
if(empty($poskod)){
$poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
}
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
<input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
<input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
</div>
</div>
<div class='form-group row col-md-12'>
@@ -337,7 +340,7 @@
@php
$negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
@endphp
<input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
<input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
</div>
</div>
<div class='form-group row col-md-12'>
@@ -556,7 +559,7 @@
function checkAGH()
{
$('AGHModalEdit').hide();
}
function checktuntutbaki(e)
@@ -688,23 +691,35 @@
}
}
function ulangcetakagh()
function ulangcetakagh(e)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
var komen2 = $(e).data('komen2');
var noruj = $(e).data('histid');
if(komen2 !== null)
{
if($("input[name='options']:checked").val() == 'belum_tebus'){
let histid = $('input[name="belum"]:checked').val();
if(histid == null){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}else{
let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
urlroute = urlroute.replace(':id', histid);
window.open(urlroute, '_blank');
swal.close();
if(histid == null){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Sila pilih salah satu SAG'
});
}else{
let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
urlroute = urlroute.replace(':id', histid);
window.open(urlroute, '_blank');
swal.close();
}
}
}else{
$('#AGHModalEdit').modal('show');
$('#norujukanhiddenedit').val(noruj);
swal.close();
}
return;
}
function saghilangfunc()
@@ -724,6 +739,7 @@
data:{ "norujukan" : histid,"kodcaw" : kodcaw},
success:function(data)
{
var count = Object.keys(data).length;
if(count > 0)
@@ -735,7 +751,7 @@
showConfirmButton: false,
html: "<br>" +
'<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
'<button type="button" role="button" tabindex="0" class="btn btn-primary" onclick="ulangcetakagh()">' + 'Ulang Cetak' + '</button>',
'<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-komen2="' + data[0].komen2 + '">' + 'Ulang Cetak' + '</button>',
icon: 'error',
title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
});
@@ -791,6 +807,24 @@
});
$('#negeriaghedit').change(function(){
var daerahselect = document.getElementById("daerahaghedit");
$('#daerahaghedit').attr('disabled', false);
$(daerahagh).empty();
$.ajax({
method:'get',
url: api_url + '/api/daerahkodnegeri/' + this.value,
success:function(data){
$.each(data, function( index, daerah ){
addOptionEdit(daerah.koddaerah,daerah.namadaerah);
});
}
});
});
function addOption(textopt,valueopt) {
optionText = textopt;
@@ -799,6 +833,14 @@
$('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
}
function addOptionEdit(textopt,valueopt) {
optionText = textopt;
optionValue = valueopt;
$('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
}
function rekodasal(gadaian){
resources/views/khazanah/kelulusan.blade.php
+27 -5
View File
@@ -264,7 +264,7 @@
async function updatelulus(e)
{
let api = "{{ config('api.url') }}";
let kodcaw = " {{ Auth::user()->cawangan }}";
let kodcaw = "{{ Auth::user()->cawangan }}";
const { value: katalaluan } = await Swal.fire({
title: 'Masukkan Katalaluan Semula',
@@ -311,6 +311,7 @@
allowOutsideClick: false
})
let teller = $(e).closest('tr').children('td:eq(1)').text();
let nm = $(e).closest('tr').children('td:eq(4)').text();
let ber = $(e).closest('tr').children('td:eq(5)').text();
let marg = $(e).closest('tr').children('td:eq(6)').text();
@@ -320,6 +321,9 @@
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
@@ -329,7 +333,9 @@
"norujukan" : norujukan,
"pelulus" : pelulus,
"siri" : siri,
'komen' : komen
'komen' : komen,
'namakhazanah' : namakhazanah,
'teller' : teller
},
success:function(data){
Swal.fire({
@@ -394,9 +400,13 @@
allowOutsideClick: false
})
let teller = $(e).closest('tr').children('td:eq(1)').text();
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
let siri = $(e).data('siri');
let namakhazanah = "{{ Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
@@ -407,7 +417,10 @@
"pelulus" : pelulus,
"siri" : siri,
"komenkelulusan" : komenkelulusan,
"pembatalan" : "batal"
"pembatalan" : "batal",
'namakhazanah' : namakhazanah,
'teller' : teller
},
success:function(data){
Swal.fire({
@@ -467,15 +480,19 @@
let norujukan = $(e).data('norujukan');
let teller = $(e).closest('tr').children('td:eq(1)').text();
let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
teller = String(teller);
$.ajax({
method:'put',
url: "{{ route('khazanah.updatekelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"khazanah" : namakhazanah
"khazanah" : namakhazanah,
'teller' : teller
},
success:function(data){
@@ -543,6 +560,9 @@
let norujukan = $(e).data('norujukan');
let namakhazanah = "{{ $auth_user = Auth::user()->name }}";
let teller = $(e).closest('tr').children('td:eq(1)').text();
teller = String(teller);
$.ajax({
method:'put',
@@ -552,7 +572,9 @@
"norujukan" : norujukan,
"khazanah" : namakhazanah,
"komenubahhapus" : komenkelulusan,
"batal" : 'batal'
"batal" : 'batal',
'teller' : teller
},
success:function(data){
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
+8 -32
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">
@@ -20,8 +26,6 @@
@csrf
<div class="row">
<div class="col-sm-2">Mula</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
@@ -33,7 +37,7 @@
<div class="row">
<div class="col-sm-1"> </div> <div class="col-sm-6"></div>
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formaction="{{route('cetak.lejer_am')}}">
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank" formaction="{{route('cetak.lejer_am')}}">
</div>
</div>
@@ -51,34 +55,6 @@
</form>
</div><!--end section form-->
<br>
<br>
<div class="row">
<div class="col-md-12">
<table class="" id="myTable">
<thead>
<tr>
<th>Bil</th>
<th>Bil Gadaian</th>
<th>Jumlah Pinjaman (RM)</th>
<th>Peratusan %</th>
</tr>
</thead>
</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/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/laporan/petibesi.blade.php
+6
View File
@@ -44,6 +44,12 @@
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
$(document).ready( function () {
$('#datetimepicker1').datepicker({
format: 'dd-mm-yyyy'
});
});
var tablecustomers = $('#myTable').DataTable({
"ordering": false
});
resources/views/khazanah/panjar.blade.php
+127 -4
View File
@@ -71,6 +71,7 @@
<th>deskripsi</th>
<th>kategori</th>
<th>bayaran</th>
<th>tindakan</th>
</tr>
</thead>
</table>
@@ -154,21 +155,92 @@
var counter = 1;
tablepanjar.clear().draw();
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
today = yyyy + '-' + mm + '-' + dd;
$.each(data,function(index,panjar){
tablepanjar.row.add([
if(today === panjar['tarikh'])
{
tablepanjar.row.add([
counter,
panjar['tarikh'],
panjar['deskripsi'],
panjar['kategori'],
panjar['bayaran']
panjar['bayaran'],
'<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;
});
}
function deletepanjar(e)
{
let rec_no = $(e).data('recno');
Swal.fire({
title: 'Adakah anda pasti?',
text: "Anda tidak dapat untuk mengembalinya kembali!",
icon: 'warning',
showCancelButton: true,
cancelButtonText: "Batal",
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Teruskan!'
}).then((result) => {
if (result.isConfirmed) {
$.ajax({
method: 'post',
url: '{{ route("khazanah.deletepanjar") }}',
data: {
"_token": "{{ csrf_token() }}",
'recno' : rec_no
},
success:function(data){
if(data === 'berjaya')
{
location.reload();
}else{
Swal.fire(
'Tidak Berjaya!',
'Data tidak berjaya dihapuskan.',
'error'
)
}
}
});
}
});
}
function caritarikh()
{
let mula = $('#mula').val();
@@ -322,7 +394,14 @@ function kiraanpanjar(datakeyin)
function checkformpanjar(formdata)
{
$("#terima_transaksi_keraian").prop('disabled', true);
$("#terima_transaksi_selenggara").prop('disabled', true);
$("#terima_transaksi_belanjaam").prop('disabled', true);
$("#terima_transaksi_perubatan").prop('disabled', true);
$("#terima_transaksi_dapur").prop('disabled', true);
$("#terima_transaksi_pos").prop('disabled', true);
// let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
let baucer = $(formdata).find("[name='baucer']").val();
@@ -409,9 +488,18 @@ function kiraanpanjar(datakeyin)
if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
{
return true;
}else{
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
event.preventDefault();
return;
}
@@ -500,6 +588,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
@@ -531,6 +626,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
$('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -561,6 +663,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
$('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -591,6 +700,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
@@ -622,6 +738,13 @@ function kiraanpanjar(datakeyin)
$(this).find("[name='errorbayaran']").hide();
$(this).find("[name='bayaran']").removeClass('is-invalid');
$(this).find("[name='bayaran']").parent().addClass("mb-4");
$("#terima_transaksi_keraian").prop('disabled', false);
$("#terima_transaksi_selenggara").prop('disabled', false);
$("#terima_transaksi_belanjaam").prop('disabled', false);
$("#terima_transaksi_perubatan").prop('disabled', false);
$("#terima_transaksi_dapur").prop('disabled', false);
$("#terima_transaksi_pos").prop('disabled', false);
});
// $('#denominasipanjar').on('hidden.bs.modal', function (e) {
resources/views/khazanah/pendahuluanserahanmain.blade.php
+41 -8
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,16 +29,18 @@
<th>Description</th>
<th>Pendahuluan (RM)</th>
<th>Serahan (RM)</th>
{{-- <th>Tindakan</th> --}}
</tr>
</thead>
<tbody>
@foreach ($listgldetail as $gldetail)
<tr>
<td>{{ $gldetail['tarikh'] }}</td>
<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>
</tr>
<tr>
<td>{{ $gldetail['tarikh'] }}</td>
<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>
{{-- @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>
</table>
@@ -110,6 +112,28 @@
});
function deletependser()
{
Swal.fire({
title: 'Adakah anda pasti?',
text: "Anda tidak dapat untuk mengembalinya kembali!",
icon: 'warning',
showCancelButton: true,
cancelButtonText: "Batal",
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Teruskan!'
}).then((result) => {
if (result.isConfirmed) {
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
}
});
}
function validateformat(evt)
{
var charCode = (evt.which) ? evt.which : event.keyCode
@@ -144,6 +168,7 @@
function functerima()
{
let amaun = $('#amaun').val();
let keterangan = $('#keterangan').val();
let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -198,6 +223,9 @@
$('#pendahuluanserahanModal').modal('hide');
return true;
}else{
$("#terima_transaksi").prop('disabled', false);
event.preventDefault();
return false;
}
@@ -226,6 +254,8 @@
$('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('show');
$("#terima_transaksi").prop('disabled', false);
$('#bundle1').val('');
$('#totalb1').val(0.00);
$('#bundle5').val('');
@@ -243,6 +273,8 @@
function terimapost()
{
$("#terima_transaksi").prop('disabled', true);
let amaun = $('#amaundiminta').val();
let keterangan = $('#keterangan').val();
let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -298,7 +330,7 @@
$('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('hide');
location.reload();
});
}else if(data == 'GAGAL'){
@@ -309,6 +341,7 @@
$('#denominasiHQModal').modal('hide');
$('#pendahuluanserahanModal').modal('hide');
$("#terima_transaksi").prop('disabled', false);
});
}