Merge branch 'fixkaunter' of https://gitlab.com/online-sistem1/kaunter into fixkaunter

This commit is contained in:
hafifierahman
2022-04-13 11:44:29 +08:00
4 changed files with 56 additions and 76 deletions
@@ -180,7 +180,7 @@
<a href="{{ url('unjuran') }}" class="btn btn-danger btn-lg btn-block mb-3">Unjuran</a>
</div>
<div class="row">
<a href="#" class="btn btn-danger btn-lg btn-block mb-3">Permohonan</a>
<a href="{{ url('permohonan') }}" class="btn btn-danger btn-lg btn-block mb-3">Permohonan</a>
</div>
</div>
@@ -1,6 +1,7 @@
@extends('layouts.app')
@section('content')
@include('modal.permohonanwang')
@include('modal.CITModal')
<div class="container">
<div class="row justify-content-center">
@@ -73,7 +74,7 @@
echo '<button data-mohonid="' . $mohon["mohonid"] . '" 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">CIT</button>';
echo '<button data-mohonid="' . $mohon["mohonid"] . '" id="btncit" class="btn btn-secondary" data-toggle="modal" data-target="#CITModal">CIT</button>';
}
else{
echo '<span class="p-2 badge badge-info">DALAM PROSES</span>';
@@ -188,79 +189,5 @@
});
});
$(document).on('click', '#btncit', function(e) {
let mid = $(this).data("mohonid");
var bank = @php echo json_encode($bank) @endphp;
var options = {};
$.map(bank,
function(o) {
options[o.abbreviation] = o.name;
});
Swal.fire({
title: 'BANK CIT',
text: 'Sila Pilih Bank',
input: 'select',
inputOptions: options,
showCancelButton: true,
animation: 'slide-from-top',
inputPlaceholder: 'Sila Pilih Bank',
allowOutsideClick: false,
preConfirm: (value) => {
if(!value){
Swal.showValidationMessage(
`Pilih Bank yang dinyatakan`
);
}
}
}).then(function (result) {
if (result) {
if (result.isConfirmed) {
let cit = result.value;
Swal.fire({
title: 'Masukkan No Resit',
input: 'text',
animation: 'slide-from-top',
inputPlaceholder: 'No Resit',
allowOutsideClick: false,
preConfirm: (value) => {
if(!value){
Swal.showValidationMessage(
`Masukkan No Resit Di dalam kotak disediakan`
);
}
}
}).then(function (response) {
if(response){
$.ajax({
method:"put",
url: api_url + '/admin/permohonan/tagcit',
data: {
"mohonid" : mid,
"bank" : cit,
"resitcit" : response.value
},
success:function(data)
{
if(data === 1)
Swal.fire('Diterima!', '', 'success')
}
});
}
});
}else{
}
}
});
});
</script>
@endsection
+51
View File
@@ -0,0 +1,51 @@
<div class="modal fade" id="CITModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title text-center" id="ModalTitle">Cash In Transit (CIT)</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="container">
<form method="post" action="{{ route('permohonan.cit') }}" enctype="multipart/form-data">
<div class="d-flex mb-2">
<label class="col-4">Bank</label>
<select name="selectedbank" class="form-control col-8">
@foreach($bank as $b)
<option value="{{ $b['abbreviation'] }}">{{ $b['name'] }}</option>
@endforeach
</select>
</div>
<div class="d-flex mb-2">
<label class="col-4">No Resit</label>
<input type="text" name="noresit" class="form-control"/>
</div>
<div class="d-flex mb-2">
<label class="col-4" name="resit">Resit</label>
<input type="file"/>
</div>
<div class="d-flex mb-2">
<label class="col-4">Invoice</label>
<input type="file" name="invoice"/>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
<button type="submit" class="btn btn-success">Hantar</button>
</div>
</form>
</div>
</div>
</div>
+2
View File
@@ -141,6 +141,8 @@ Route::get('/permohonan',['as'=>'permohonan.index','uses' => 'KhazanahController
Route::get('/permohonan/rekod',['as'=>'permohonan.rekod','uses' => 'KhazanahController@RekodPermohonan'])->middleware('auth','khazanah');
Route::post('/permohonan/simpan',['as'=>'permohonan.simpan','uses' => 'KhazanahController@SimpanPermohonan'])->middleware('auth','khazanah');
Route::get('/permohonan/status/{mohonid}',['as'=>'permohonan.status','uses' => 'KhazanahController@StatusPermohonan'])->middleware('auth','khazanah');
Route::get('/permohonan/cit/{mohonid}',['as'=>'permohonan.cit','uses' => 'KhazanahController@CITPermohonan'])->middleware('auth','khazanah');
Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);