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

fix skit2

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-03-30 16:31:32 +08:00
parent 4922237a87
commit 7fb5ef42d3
3 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/laporan/index.blade.php
+1 -1
View File
@@ -56,7 +56,7 @@
<a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pelanggan</a>
</div>
<div class="row">
<a href="" class="btn btn-primary btn-lg btn-block mb-3" data-toggle="modal" data-target="#myModal">GL</a>
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">GL</a>
</div>
</div>
<div class="col-3 mx-1">
resources/views/khazanah/panjar.blade.php
+47 -13
View File
@@ -76,7 +76,6 @@
var api_url = "<?php echo $api_url ?>";
var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
$(".modal.fade").on("show.bs.modal", function(e) {
$.ajax({
@@ -99,11 +98,6 @@
});
var tablepanjar = $('#table-panjar').DataTable({
"scrollX": true
});
@@ -199,13 +193,54 @@
}
function checkformpanjar()
function checkformpanjar(formdata)
{
// return false;
// // let baucer = $('input[name').val();
// console.log('test');
// console.log('test');
let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan;
//Variable Initialize
let baucer = $(formdata).find("[name='baucer']").val();
let tarikh = $(formdata).find("[name='tarikh']").val();
let tuntutan = $(formdata).find("[name='tuntutan']").val();
let tarikhbil = $(formdata).find("[name='tarikhbil']").val();
let deskripsi = $(formdata).find("[name='deskripsi']").val();
let bayaran = $(formdata).find("[name='bayaran']").val();
var validation = Array.prototype.filter.call(formdata, function(form) {
if (form.checkValidity() === false) {
event.preventDefault();
event.stopPropagation();
}
form.classList.add('is-invalid');
});
if(!tarikh)
{
console.log('tarikh xleh');
}
if(!tarikhbil)
{
console.log('tarikh xde');
}
if(dapur === false)
{
if(!tuntutan)
console.log('tututan xde');
}
if(deskripsi === '' || deskripsi === null)
{
console.log('deskripsi xde');
}
if(bayaran === null || bayaran === '')
{
console.log('bayaran xde');
}
return false;
}
function openupdeno()
@@ -216,7 +251,7 @@
function terimadeno()
{
// alert($('#keraianModal').hasClass('in')); --> nak tahu modal mano huk shown lagi
// $keraian = $('#keraianModal').hasClass('in');
// $selenggara = $('#SelenggaraModal').hasClass('in');
@@ -226,7 +261,6 @@
// if($keraian == true)
// if($selenggara == true)
// if($belanjaam == true)
resources/views/modal/panjar.blade.php
+29 -14
View File
@@ -8,7 +8,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" novalidate onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="keraian"/>
@@ -18,51 +18,66 @@
<label>Baucer No: </label>
</div>
<div class="col-8">
<input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
<input type="text" name="baucer" class="form-control-plaintext mb-4 baucer" readonly/>
</div>
<div class="col-4">
<label>Tarikh: </label>
</div>
<div class="col-8">
<input type="date" class="form-control mb-4" name="tarikh"/>
<input type="date" class="form-control mb-4" name="tarikh" required/>
<div class="invalid-feedback mb-4">
tarikh haruslah dimasukkan ke dalam ni!
</div>
</div>
<div class="col-4">
<label>Tuntutan Oleh: </label>
</div>
<div class="col-8">
<select name="tuntutan" class="form-control mb-4">
<select name="tuntutan" class="form-control mb-4" required>
@foreach($usercawangan as $user)
<option value="{{ $user->name }}">{{ $user->name }}</option>
@endforeach
</select>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
{{-- <input type="text" class="form-control mb-4" name="tuntutan"/> --}}
</div>
<div class="col-4">
<label>Tarikh Bil: </label>
</div>
<div class="col-8">
<input type="date" class="form-control mb-4" name="tarikhbil"/>
<input type="date" class="form-control was-validated mb-4" name="tarikhbil" required/>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
</div>
<div class="col-4">
<label>Deskripsi:</label>
</div>
<div class="col-8">
<textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
<textarea row="3" name="deskripsi" class="form-control mb-4" minlength='6' maxlength='25' required> </textarea>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
</div>
<div class="col-4">
<label>Bayaran (RM): </label>
</div>
<div class="col-8">
<div class="row pl-3">
<input type="text" class="form-control col-8" name="bayaran" readonly/>
<input type="text" class="form-control-plaintext col-8" name="bayaran" required readonly/>
<button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
<div class="invalid-feedback">
tarikh haruslah dimasukkan ke dalam ni!
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-success">Terima</button>
<button type="submit" class="btn btn-success">Terima</button>
</div>
</form>
</div>
@@ -79,7 +94,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="selenggara"/>
@@ -133,7 +148,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
<button type="button" class="btn btn-success">Terima</button>
<button type="submit" class="btn btn-success">Terima</button>
</div>
</form>
</div>
@@ -150,7 +165,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="belanjaam"/>
@@ -223,7 +238,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="perubatan"/>
@@ -295,7 +310,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="dapur"/>
@@ -367,7 +382,7 @@
<span aria-hidden="true">&times;</span>
</button>
</div>
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar();">
<form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" onsubmit="return checkformpanjar(this);">
@csrf
<div class="modal-body text-center">
<input type="hidden" name="jenismodal" value="pos"/>