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

fix

Browse Source
This commit is contained in:
hafifierahman
2022-04-17 11:24:55 +08:00
parent 54c83c7022
commit 4cc1220a1a
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/permohonanwang.blade.php
+13 -5
View File
@@ -38,7 +38,7 @@
<div class="d-flex justify-content-between mb-2">
<h5 class="mt-2">Senarai Permohonan Masih Aktif</h5>
<div>
<button class="btn btn-info" data-toggle="modal" data-target="#PermohonanWang">Mohon</button>
<button class="btn btn-info" data-backdrop="static" data-keyboard="false" data-toggle="modal" data-target="#PermohonanWang">Mohon</button>
<a class="btn btn-info" href="{{ route('permohonan.rekod') }}">Rekod Permohonan</a>
</div>
</div>
@@ -64,17 +64,17 @@
<td>{{ $mohon['tarikh_permohonan'] }}</td>
<td>{{ number_format($mohon['amaun_mohon'],2) }}</td>
<td>
<a href="{{ route('permohonan.status', ['mohonid' => $mohon['mohonid']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
<a href="{{ route('permohonan.status', ['mohonid' => $mohon['nopermohonan']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
</td>
<td>{{ $mohon['jenismohon'] }}</td>
<td>
@php
if($mohon['tagdeposit'] === 1)
{
echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
echo '<button data-mohonid="' . $mohon["nopermohonan"] . '" id="btnterima" class="btn btn-success"><i class="fas fa-check"></i></button>';
}else if(($mohon['tagcit'] === 0 && $mohon['jenismohon'] === 'bayaranbalik'))
{
echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btncit" class="btn btn-secondary" data-toggle="modal" data-target="#CITModal">CIT</button>';
echo '<button data-mohonid="' . $mohon["nopermohonan"] . '" id="btncit" class="btn btn-secondary" data-toggle="modal" data-backdrop="static" data-keyboard="false" data-target="#CITModal">CIT</button>';
}
else{
echo '<span class="p-2 badge badge-info">DALAM PROSES</span>';
@@ -106,11 +106,14 @@
$(this)
.find("input[name='jumlahmohon']")
.val('')
.removeClass('is-invalid')
.end()
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
$("#erroramaun").hide();
$("#pilihper").hide();
})
@@ -135,6 +138,11 @@
$("#erroramaun").show();
// $("[name='erroramaun']").text("*Isikan amaun dalam input!");
$("[name='jumlahmohon']").addClass('is-invalid');
boolamaun = true;
}else{
$("#erroramaun").hide();
$("[name='jumlahmohon']").removeClass('is-invalid');
boolamaun = false;
}
if(!jenis)
@@ -143,7 +151,7 @@
booljenis = true;
}else{
$("pilihper").hide();
$("#pilihper").hide();
booljenis = false;
}
resources/views/khazanah/rekodpermohonan.blade.php
+2 -2
View File
@@ -55,11 +55,11 @@
<td>{{ number_format($mohon['amaun_mohon'],2) }}</td>
<td>{{ number_format($mohon['jumlah_diluluskan'],2) }}</td>
<td>
<a href="{{ route('permohonan.status', ['mohonid' => $mohon['mohonid']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
<a href="{{ route('permohonan.status', ['mohonid' => $mohon['nopermohonan']]) }}" class="btn btn-info"><i class="fas fa-eye"></i></a>
</td>
<td>{{ $mohon['jenismohon'] }}</td>
<td>@php
if($mohon['tagterima'] === 1)
if($mohon['tagterima'] === 1 || ($mohon['jenismohon'] == 'bayaranbalik' && $mohon['tagoperasi'] === 1 && $mohon['tagcit'] === 1 && $mohon['tagakaun'] === 1))
echo '<span class="p-2 badge badge-success">BERJAYA</span>';
else echo '<span class="p-2 badge badge-danger">BATAL</span>'; @endphp</td>
resources/views/modal/permohonanwang.blade.php
+5 -5
View File
@@ -18,21 +18,21 @@
</div>
<div class="col-12 d-flex mb-2">
<label class="col-6">Jumlah Permohonan (RM)</label>
<div class="col-6">
<label class="col-8">Jumlah Permohonan (RM)</label>
<div class="col-4">
<input type="text" name="jumlahmohon" id="jumlahmohon" class="form-control" placeholder="Jumlah Permohonan (RM)"/>
<div id="erroramaun" class="invalid-feedback">*Nyatakan Jumlah Permohonan</div>
</div>
</div>
<div class="col-12 d-flex mb-2">
<label class="col-6">Tarikh Mohon</label>
<label class="col-8">Tarikh Mohon</label>
<p class="col-6">{{ $tarikhsemasa }}</p>
<input type="hidden" id="tarikhmohon" name="tarikhmohon" readonly class="col-6 form-control" value="{{ $tarikhsemasa }}"/>
</div>
<div class="col-12 d-flex mb-2">
<label class="col-6">Baki Peti Besi (RM)</label>
<label class="col-8">Baki Peti Besi (RM)</label>
<p class="col-6">RM {{ number_format($getVault,2) }}</p>
<input type="hidden" id="bakipetibesi" name="bakipetibesi" readonly class="col-6 form-control" value="{{ $getVault }}"/>
</div>
@@ -43,7 +43,7 @@
</div> --}}
<div class="col-12 d-flex mb-2">
<label class="col-6">Outstanding (RM)</label>
<label class="col-8">Outstanding (RM)</label>
<p class="col-6">RM {{ number_format($dashboard[0]['outstanding'],2) }}</p>
<input type="hidden" id="outstanding" name="outstanding" readonly class="col-6 form-control" value="{{ $dashboard[0]['outstanding'] }}"/>
</div>