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

Merge branch 'pipi' into 'master'

Browse Source 
aliran tunai fix carry forward baki

See merge request online-sistem1/kaunter!60
This commit is contained in:
hafifie rahman
2021-02-17 08:32:10 +00:00
parent 7859060bb1 2acfa73d31
commit fb145a4dda
4 changed files with 632 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+41
View File
@@ -21,6 +21,30 @@ class AliranTunaiController extends Controller
$alirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $auth_user['name']])->json();
if(sizeof($alirantunai) == 0)
{
$latesttunai = Http::get(config('api.url') . '/api/GetLatestTunai/'. $auth_user['cawangan'], ['kodlaluan' => $auth_user['name']])->json();
if(sizeof($latesttunai) > 0)
{
if($latesttunai[0]['baki'] != 0)
{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name'],
'bakiawal' => $latesttunai[0]['baki'],
'masuk' => 0.00,
'yuran' => 0.00,
'keluar' => 0.00,
'baki' => $latesttunai[0]['baki'],
'tambah' => 0.00,
'kurang' => 0.00
])->json();
}
else
{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $auth_user['cawangan'],
@@ -35,6 +59,23 @@ class AliranTunaiController extends Controller
])->json();
}
}
else{
$alirantunai = Http::post(config('api.url') . '/api/tunai/daftarTunai/' . $auth_user['cawangan'], [
'kodcaw' => $auth_user['cawangan'],
'teller' => $auth_user['name'],
'bakiawal' => 0.00,
'masuk' => 0.00,
'yuran' => 0.00,
'keluar' => 0.00,
'baki' => 0.00,
'tambah' => 0.00,
'kurang' => 0.00
])->json();
}
}
$denominasi=Http::get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
if(sizeof($denominasi) == 0)
resources/views/aliran_tunai/index.blade.php
+52 -34
View File
@@ -15,23 +15,44 @@
<div class="col-md-12">
<a href="{{ url('/') }}"><i class="fas fa-arrow-left"></i> Kembali</a>
<h3 class="text-uppercase text-center">aliran tunai</h3>
<div class="row justify-content-center">
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="justify-content-center col-4">
<div class="col-12">
<div class="small-box bg-info">
<div class="inner">
<h3>RM {{ number_format($alirantunai['bakiawal'],2) }}</h3>
<h4>RM {{ number_format($alirantunai['bakiawal'],2) }}</h4>
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
<i class="ion ion-cash"></i>
<i class="fas fa-money-bill-alt"></i>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="col-12">
<div class="small-box bg-info">
<div class="inner">
<h4 id="bakiakhir">RM {{ number_format($alirantunai['baki'],2) }}</h4>
<p>Baki Tunai Semasa</p>
</div>
<div class="icon">
<i class="fas fa-cash-register"></i>
</div>
</div>
</div>
</div>
<div class="justify-content-center col-4">
<div class="col-12">
<div class="small-box bg-success">
<div class="inner">
<h3>RM {{ number_format($alirantunai['tambah'],2) }}</h3>
<h4>RM {{ number_format($alirantunai['tambah'],2) }}</h4>
<p>Pendahuluan</p>
</div>
@@ -40,10 +61,10 @@
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="col-12">
<div class="small-box bg-danger">
<div class="inner">
<h3>RM {{ number_format($alirantunai['kurang'],2) }}</h3>
<h4>RM {{ number_format($alirantunai['kurang'],2) }}</h4>
<p>Serahan</p>
</div>
@@ -53,34 +74,13 @@
</div>
</div>
</div>
<div class="row justify-content-center">
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="small-box bg-warning">
<div class="inner">
<h3 id="bakiakhir">RM {{ number_format($alirantunai['baki'],2) }}</h3>
<p>Baki Akhir Tunai</p>
</div>
<div class="icon">
<i class="fas fa-cash-register"></i>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="justify-content-center col-4">
<div class="col-12">
<div class="small-box bg-success">
<div class="inner">
<h3>RM {{ number_format($alirantunai['keluar'],2) }}</h3>
{{-- <h3>{{ $GT['gcount'] }}</h3> --}}
<p>Jumlah Gadaian</p>
</div>
<div class="icon">
<i class="fas fa-minus-square"></i>
</div>
</div>
</div>
<div class="col-lg-4 col-md-6 col-sm-12">
<div class="small-box bg-danger">
<div class="inner">
<h3>RM {{ number_format($alirantunai['masuk'],2) }}</h3>
<h4>RM {{ number_format($alirantunai['masuk'],2) }}</h4>
{{-- <h3>{{ $GT['tcount'] }}</h3> --}}
<p>Jumlah Penebusan</p>
</div>
@@ -88,8 +88,26 @@
<i class="fas fa-plus-square"></i>
</div>
</div>
</div>
<div class="col-12">
<div class="small-box bg-danger">
<div class="inner">
<h4>RM {{ number_format($alirantunai['keluar'],2) }}</h4>
{{-- <h3>{{ $GT['gcount'] }}</h3> --}}
<p>Jumlah Gadaian</p>
</div>
<div class="icon">
<i class="fas fa-minus-square"></i>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12 text-center">
<input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
resources/views/gadaian/edit.blade.php
+43
View File
@@ -716,6 +716,45 @@
var min_pinjaman = nilai_marhun_total * 0.10;
var max_pinjaman = nilai_marhun_total * 0.80;
let teller = "{{ Auth::user()->name }}";
let bakiakhir = 0;
var kodcaw = $('#kodcaw').val();
$.ajax({
method: 'get',
url: api_url + '/api/GetCurrentTunai/' + kodcaw,
async: false,
dataType:'json',
data:{
'kodlaluan': teller
},
success:function(data){
bakiakhir = data.baki;
}
});
if(bakiakhir < pinjaman)
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Baki Akhir Tunai Lebih Rendah Daripada Nilai Marhun Yang Ingin Digadaikan. Sila Tambah Pendahuluan di Laman Aliran Tunai Segera. '
});
event.preventDefault();
return false;
}else{
if($.isNumeric(pinjaman) == false){
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Nombor Sahaja'
});
event.preventDefault();
return false;
}
if(pinjaman < min_pinjaman){
$("#terima_gadai").prop('disabled', false);
Swal.fire({
@@ -962,6 +1001,10 @@
}
}
}
</script>
@endsection
resources/views/gadaian/index.blade.php
+33 -32
View File
@@ -402,38 +402,6 @@
minimumFractionDigits: 2
});
$('#daftar_marhun').on('show.bs.modal', function(event) {
let teller = "{{ Auth::user()->name }}";
let bakiakhir = 0;
var kodcaw = $('#kodcaw').val();
$.ajax({
method: 'get',
url: api_url + '/api/GetCurrentTunai/' + kodcaw,
async: false,
dataType:'json',
data:{
'kodlaluan': teller
},
success:function(data){
bakiakhir = data.baki;
}
});
if(bakiakhir <= total_nilai_marhun)
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Baki Akhir Tunai Lebih Rendah Daripada Nilai Marhun Yang Ingin Digadaikan. Sila Tambah Pendahuluan di Laman Aliran Tunai Segera. '
});
return false;
}
});
$('#terima_marhun').click(function(){
var kodcaw = $('#kodcaw').val();
var norujukan = $('#norujukan').val();
@@ -657,6 +625,36 @@
var min_pinjaman = nilai_marhun_total * 0.10;
var max_pinjaman = nilai_marhun_total * 0.80;
let teller = "{{ Auth::user()->name }}";
let bakiakhir = 0;
var kodcaw = $('#kodcaw').val();
$.ajax({
method: 'get',
url: api_url + '/api/GetCurrentTunai/' + kodcaw,
async: false,
dataType:'json',
data:{
'kodlaluan': teller
},
success:function(data){
bakiakhir = data.baki;
}
});
if(bakiakhir < pinjaman)
{
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Baki Akhir Tunai Lebih Rendah Daripada Nilai Marhun Yang Ingin Digadaikan. Sila Tambah Pendahuluan di Laman Aliran Tunai Segera. '
});
event.preventDefault();
return false;
}else{
if($.isNumeric(pinjaman) == false){
$("#terima_gadai").prop('disabled', false);
Swal.fire({
@@ -952,6 +950,9 @@
}
});
}
}
}