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

fix banyak

Browse Source
This commit is contained in:
hafifierahman
2021-03-28 10:15:39 +08:00
parent c0845ccfdd
commit 14ae96d86c
7 changed files with 305 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+17
View File
@@ -2333,4 +2333,21 @@ class KhazanahController extends Controller
}
public function RequestPembatalan(Request $request)
{
$kodcaw = $request->kodcaw;
$nombor = $request->no;
$kodlaluan = $request->kodlaluan;
$updatebatal=Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[
'no'=>$nombor,
'kodlaluan'=>$kodlaluan
]);
event(new PendahuluanSerahan("Batal"));
return response('Berjaya');
}
}
public/js/main.js
Vendored
+39 -16
View File
@@ -336,15 +336,26 @@ async function openuptambahdanserah(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
// let message = JSON.stringify(data);
Swal.fire({
icon: 'success',
title: 'Tambah Pendahuluan',
text: 'Tambah Pendahuluan berjaya dipohon!'
}).then(function(){
location.reload();
});
if(data == 'Lulus')
{
Swal.fire({
icon: 'success',
title: 'Tambah Pendahuluan',
text: 'Tambah Pendahuluan berjaya dipohon!'
}).then(function(){
location.reload();
});
}else{
Swal.fire({
icon: 'error',
title: 'Tambah Pendahuluan',
text: 'Tambah Pendahuluan tidak diluluskan!'
}).then(function(){
location.reload();
});
}
});
@@ -486,14 +497,26 @@ function tambahdanserahanfunc(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
// let message = JSON.stringify(data);
Swal.fire({
icon: 'success',
title: 'Serahan Modal',
text: 'Serahan modal berjaya dipohon!'
}).then(function(){
location.reload();
});
if(data == 'Lulus')
{
Swal.fire({
icon: 'success',
title: 'Serahan Modal',
text: 'Serahan modal berjaya dipohon!'
}).then(function(){
location.reload();
});
}else{
Swal.fire({
icon: 'error',
title: 'Serahan Modal',
text: 'Serahan modal tidak diluluskan!'
}).then(function(){
location.reload();
});
}
});
resources/views/homepage/khazanah/home.blade.php
+37 -37
View File
@@ -242,62 +242,62 @@
$.each(data, function(key,val) {
$('#bundle1').val(val.bd1);
$('#totalb1').val(val.b1);
$('#bundle1').val(parseFloat(val.bd1).toFixed(2));
$('#totalb1').val(parseFloat(val.b1).toFixed(2));
$('#bundle20').val(val.bd20);
$('#totalb20').val(val.b20);
$('#bundle20').val(parseFloat(val.bd20).toFixed(2));
$('#totalb20').val(parseFloat(val.b20).toFixed(2));
$('#bundle5').val(val.bd5);
$('#totalb5').val(val.b5);
$('#bundle5').val(parseFloat(val.bd5).toFixed(2));
$('#totalb5').val(parseFloat(val.b5).toFixed(2));
$('#bundle50').val(val.bd50);
$('#totalb50').val(val.b50);
$('#bundle50').val(parseFloat(val.bd50).toFixed(2));
$('#totalb50').val(parseFloat(val.b50).toFixed(2));
$('#bundle10').val(val.bd10);
$('#totalb10').val(val.b10);
$('#bundle10').val(parseFloat(val.bd10).toFixed(2));
$('#totalb10').val(parseFloat(val.b10).toFixed(2));
$('#bundle100').val(val.bd100);
$('#totalb100').val(val.b100);
$('#bundle100').val(parseFloat(val.bd100).toFixed(2));
$('#totalb100').val(parseFloat(val.b100).toFixed(2));
$('#sen1').val(val.txtsen1);
$('#totalsen1').val(val.k01);
$('#sen1').val(parseFloat(val.txtsen1).toFixed(2));
$('#totalsen1').val(parseFloat(val.k01).toFixed(2));
$('#sen5').val(val.txtsen5);
$('#totalsen5').val(val.k05);
$('#sen5').val(parseFloat(val.txtsen5).toFixed(2));
$('#totalsen5').val(parseFloat(val.k05).toFixed(2));
$('#sen10').val(val.txtsen10);
$('#totalsen10').val(val.k010);
$('#sen10').val(parseFloat(val.txtsen10).toFixed(2));
$('#totalsen10').val(parseFloat(val.k010).toFixed(2));
$('#sen20').val(val.txtsen20);
$('#totalsen20').val(val.k020);
$('#sen20').val(parseFloat(val.txtsen20).toFixed(2));
$('#totalsen20').val(parseFloat(val.k020).toFixed(2));
$('#sen50').val(val.txtsen50);
$('#totalsen50').val(val.k050);
$('#sen50').val(parseFloat(val.txtsen50).toFixed(2));
$('#totalsen50').val(parseFloat(val.k050).toFixed(2));
$('#ringgit1').val(val.txtring1);
$('#totalring1').val(val.k1);
$('#ringgit1').val(parseFloat(val.txtring1).toFixed(2));
$('#totalring1').val(parseFloat(val.k1).toFixed(2));
$('#ringgit5').val(val.txtring5);
$('#totalring5').val(val.k5);
$('#ringgit5').val(parseFloat(val.txtring5).toFixed(2));
$('#totalring5').val(parseFloat(val.k5).toFixed(2));
$('#ringgit10').val(val.txtring10);
$('#totalring10').val(val.k10);
$('#ringgit10').val(parseFloat(val.txtring10).toFixed(2));
$('#totalring10').val(parseFloat(val.k10).toFixed(2));
$('#ringgit20').val(val.txtring20);
$('#totalring20').val(val.k20);
$('#ringgit20').val(parseFloat(val.txtring20).toFixed(2));
$('#totalring20').val(parseFloat(val.k20).toFixed(2));
$('#ringgit50').val(val.txtring50);
$('#totalring50').val(val.k50);
$('#ringgit50').val(parseFloat(val.txtring50).toFixed(2));
$('#totalring50').val(parseFloat(val.k50).toFixed(2));
$('#ringgit100').val(val.txtring100);
$('#totalring100').val(val.k100);
$('#ringgit100').val(parseFloat(val.txtring100).toFixed(2));
$('#totalring100').val(parseFloat(val.k100).toFixed(2));
$('#amaunkeping').val(val.jumlahkeping);
$('#amaunbundle').val(val.jumlahbundle);
$('#amaunkeseluruhan').val(val.txtjumlah);
$('#amaunkeping').val(parseFloat(val.jumlahkeping).toFixed(2));
$('#amaunbundle').val(parseFloat(val.jumlahbundle).toFixed(2));
$('#amaunkeseluruhan').val(parseFloat(val.txtjumlah).toFixed(2));
resources/views/khazanah/pendahuluan.blade.php
+71 -7
View File
@@ -39,9 +39,9 @@
</div>
</div>
<div class="col-4">
{{-- <div class="col-4">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Hantar">
</div>
</div> --}}
</div>
@@ -144,10 +144,6 @@
});
}
getData();
// setInterval(function () {
// getData();
// }, 10000);
});
var tablependahuluan = $('#table-pendahuluan').DataTable({
@@ -158,6 +154,74 @@
minimumFractionDigits: 2
});
$('#tarikhmula').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
let tarikhhingga = $('#tarikhhingga').val();
if(tarikhhingga == '')
{
var current = new Date();
var current_date = current.getDate();
var current_month = current.getMonth()+1;
var current_year = current.getFullYear();
var today_date = current_year + '-' +current_month+'-'+current_date;
tarikhhingga = today_date;
}else{
var input_hingga = tarikhhingga;
var split_date = input_hingga.split('-');
tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
}
$.ajax({
method:'get',
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
data: {
'mula' : tarikhmula,
'hingga' : tarikhhingga
},
success: function(data){
gettable(data);
}
});
});
$('#tarikhhingga').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
let tarikhmula = $('#tarikhmula').val();
if(tarikhmula == '')
{
tarikhmula = '2018-01-01';
}else{
var input_mula = tarikhmula;
var split_date = input_mula.split('-');
tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
}
$.ajax({
method:'get',
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
data: {
'mula' : tarikhmula,
'hingga' : tarikhhingga
},
success: function(data){
gettable(data);
}
});
});
function gettable(datala)
{
var counter = 1;
@@ -178,7 +242,7 @@
'RM ' + formatter.format(arr['modal']),
'RM ' + formatter.format(arr['serahan']),
arr['tarikh'],
arr['tarikh'],
arr['masa'],
'<a href='+ urlroute + ' class="btn btn-info"><span class="fas fa-plus"></span></a>'
]).draw();
counter = counter + 1;
resources/views/khazanah/pendahuluanserah.blade.php
+34 -12
View File
@@ -20,7 +20,7 @@
<div class="col-2">Teller ID </div>
<div class="col-3"><input type="text" class="form-control" name="teller" id="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
</div>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
<input type="hidden" id="no" name="no" value="{{ $array_reqteller['no'] }}"/>
<div class="row">
<div class="col-2">Amaun (RM)</div>
@@ -36,17 +36,17 @@
<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" id="lulus_btn" value="Lulus"/>
<a href="{{ url('/pendahuluan') }}" class="btn btn-danger">Batal</a>
<a onclick="triggerbatal();" class="btn btn-danger">Batal</a>
</div>
</div>
<br>
<ul class="nav nav-tabs" id="myTab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a>
<a class="nav-link" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Bundle</a>
</li>
<li class="nav-item">
<a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a>
<a class="nav-link active" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">Keping</a>
</li>
<div style="right:0;margin-left:50%;">
<div class="row">
@@ -57,7 +57,7 @@
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="home-tab">
<h4>Wang Bundle Dari Peti Besi</h4>
<table class="table table-bordered">
@@ -74,31 +74,31 @@
<tr>
<td>RM1</td>
<td><input type="text" name="rekodb1" class="form-control" id="rekodb1" value="{{ $denominasi['bd1'] }}" readonly/></td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" data-deno="{{ $denominasi['bd1'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" data-deno="{{ $denominasi['bd1'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="{{ $denominasi['b1'] }}" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="rekodb20" class="form-control" id="rekodb20" value="{{ $denominasi['bd20'] }}" readonly/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" data-deno="{{ $denominasi['bd20'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" data-deno="{{ $denominasi['bd20'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="{{ $denominasi['b20'] }}" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="rekodb5" class="form-control" id="rekodb5" value="{{ $denominasi['bd5'] }}" readonly/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" data-deno="{{ $denominasi['bd5'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" data-deno="{{ $denominasi['bd5'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="{{ $denominasi['b5'] }}" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="rekodb50" class="form-control" id="rekodb50" value="{{ $denominasi['bd50'] }}" readonly/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" data-deno="{{ $denominasi['bd50'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" data-deno="{{ $denominasi['bd50'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="{{ $denominasi['b50'] }} " readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="rekodb10" class="form-control" id="rekodb10" value=" {{ $denominasi['bd10'] }}" readonly/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" data-deno="{{ $denominasi['bd10'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" data-deno="{{ $denominasi['bd10'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value=" {{ $denominasi['b10'] }}" readonly/> </td>
<td>RM100 </td> <td>
<input type="text" name="rekodb100" class="form-control" id="rekodb100" value="{{ $denominasi['bd100'] }}" readonly/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" data-deno="{{ $denominasi['bd100'] }}" onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" data-deno="{{ $denominasi['bd100'] }}" readonly onkeyup="totalkey(this)"/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value=" {{ $denominasi['b100'] }}" readonly/> </td>
</tr>
</table>
@@ -116,7 +116,7 @@
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<div class="tab-pane fade show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<h4>Wang Keping Dari Peti Besi</h4>
<table class="table table-bordered">
@@ -311,6 +311,7 @@
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
let notasebenar = '';
$.ajax({
method: 'get',
@@ -347,6 +348,27 @@
$('#form-pendahuluan').trigger('submit');
}
function triggerbatal()
{
let nom = $('#no').val();
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
$.ajax({
method: 'get',
url: "{{ route('request.pembatalan') }}",
data:{
'kodcaw' : kodcaw,
'no' : nom,
'kodlaluan' : teller
},
success:function(data){
window.location.href = "{{ route('khazanah.pendahulu') }}";
}
});
}
function validateamaun()
{
resources/views/khazanah/serahan.blade.php
+104 -3
View File
@@ -20,6 +20,31 @@
</div>
</div>
<div class="row">
<div class="col-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh Mula</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="tarikhmula" name="tarikhmula" aria-describedby="basic-addon1">
</div>
</div>
<div class="col-4">
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh Hingga</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="tarikhhingga" name="tarikhhingga" aria-describedby="basic-addon1">
</div>
</div>
{{-- <div class="col-4">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Hantar">
</div> --}}
</div>
<table class='table mt-4' id='table-serahan' style="width:100%;">
<thead>
@@ -105,6 +130,14 @@
var kodcaw = "{{ Auth::user()->cawangan }}";
$(document).ready(function(){
$('#tarikhmula').datepicker({
format: 'dd-mm-yyyy'
});
$('#tarikhhingga').datepicker({
format: 'dd-mm-yyyy'
});
function getData(){
$.ajax({
type: 'get',
@@ -115,9 +148,9 @@
});
}
getData();
setInterval(function () {
getData();
}, 10000);
// setInterval(function () {
// getData();
// }, 10000);
});
@@ -125,6 +158,73 @@ var tableserahan = $('#table-serahan').DataTable({
"scrollX": true
});
$('#tarikhmula').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
let tarikhhingga = $('#tarikhhingga').val();
if(tarikhhingga == '')
{
var current = new Date();
var current_date = current.getDate();
var current_month = current.getMonth()+1;
var current_year = current.getFullYear();
var today_date = current_year + '-' +current_month+'-'+current_date;
tarikhhingga = today_date;
}else{
var input_hingga = tarikhhingga;
var split_date = input_hingga.split('-');
tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
}
$.ajax({
method:'get',
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
data: {
'mula' : tarikhmula,
'hingga' : tarikhhingga
},
success: function(data){
gettable(data);
}
});
});
$('#tarikhhingga').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var tarikhhingga = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
let tarikhmula = $('#tarikhmula').val();
if(tarikhmula == '')
{
tarikhmula = '2018-01-01';
}else{
var input_mula = tarikhmula;
var split_date = input_mula.split('-');
tarikhmula = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
}
$.ajax({
method:'get',
url: api_url + '/api/requestTeller/get/' + kodcaw + '/date',
data: {
'mula' : tarikhmula,
'hingga' : tarikhhingga
},
success: function(data){
gettable(data);
}
});
});
function gettable(datala)
{
var counter = 1;
@@ -145,6 +245,7 @@ function gettable(datala)
'RM ' + arr['modal'],
'RM ' + arr['serahan'],
arr['tarikh'],
arr['masa'],
'<a href='+ urlroute + ' class="btn btn-info"><span class="fas fa-plus"></span></a>'
]).draw();
counter = counter + 1;
routes/web.php
+3
View File
@@ -122,6 +122,9 @@ Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahan
Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);
//Request Teller Batal Route
Route::get('/requestbatal',['as'=>'request.pembatalan','uses'=>'KhazanahController@RequestPembatalan'])->middleware('auth','khazanah');
//Added Yang Baru
Route::post('/barcodescannedtebus',['as'=>'barcodetebus.scanned','uses'=>'KhazanahController@barcodescannedtebus'])->middleware('auth','khazanah');
Route::get('/pendahuluanserah/{id}',['as'=>'pendahuluan.serah','uses'=>'KhazanahController@pendahuluanserah'])->middleware('auth','khazanah');