Merge branch 'pipi' into 'master'

fixing bug skit2

See merge request online-sistem1/kaunter!66
This commit is contained in:
hafifie rahman
2021-02-27 03:01:51 +00:00
7 changed files with 717 additions and 339 deletions
+3 -2
View File
@@ -166,9 +166,9 @@ class KhazanahController extends Controller
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json();
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser'));
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi'));
}
public function gadaian()
@@ -943,6 +943,7 @@ class KhazanahController extends Controller
if($amount>$baki_awal)
{
//WI ERROR MESSAGE SKIT
dd($baki_awal);
}
else
{
+31 -16
View File
@@ -283,8 +283,18 @@ async function openuptambahdanserah(e)
confirmButtonText: 'Terima',
showCancelButton:true,
cancelButtonText:'Batal',
allowOutsideClick: true
})
allowOutsideClick: true,
inputValidator: (value) => {
if (!value) {
return 'Isikan tempat kosong diatas!'
}
if(isNaN(value))
{
return 'Amaun hendaklah dalam nombor!'
}
}
});
if (amaun) {
// Swal.fire(`Entered email: ${amaun}`)
@@ -346,11 +356,11 @@ async function openuptambahdanserah(e)
}
}
else{
Swal.fire('error','Isikan kotak kosong diatas!','error');
}
}else if(id == 'serahanmodal')
{
let bakiakhir = parseFloat($('#bakiakhir').text().substring(2).replace(/[^0-9.-]+/g,""));
const { value: amaun } = await Swal.fire({
title: 'Masukkan Amaun Serahan',
input: 'text',
@@ -358,16 +368,24 @@ async function openuptambahdanserah(e)
confirmButtonText: 'Terima',
showCancelButton:true,
cancelButtonText:'Batal',
allowOutsideClick: true
})
allowOutsideClick: true,
inputValidator: (value) => {
if (!value) {
return 'Isikan tempat kosong diatas!'
}
let bakiakhir = parseFloat($('#bakiakhir').text().substring(2).replace(/[^0-9.-]+/g,""));
if(value > bakiakhir)
{
return 'Amaun serahan hendaklah tidak lebih daripada baki akhir tunai!';
}
if(isNaN(value))
{
return 'Amaun hendaklah dalam nombor!'
}
}
});
if(amaun > bakiakhir)
{
Swal.fire('error','Amaun serahan hendaklah tidak lebih daripada baki akhir tunai!','error');
return false;
}
if (amaun) {
// Swal.fire(`Entered email: ${amaun}`)
@@ -386,9 +404,6 @@ async function openuptambahdanserah(e)
}
}
else{
Swal.fire('error','Isikan kotak kosong diatas!','error');
}
}
+66 -12
View File
@@ -117,17 +117,63 @@
<div class="row mt-3">
<div class="card col-12">
<div class="card-body">
<table class="table" id="tableaddtunai">
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Debit</th>
<th>Kredit</th>
<th>Nota</th>
</tr>
</thead>
</table>
<nav>
<div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
<a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
<a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-controls="nav-profile" aria-selected="false">Gadai / Tebus</a>
<a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-controls="nav-contact" aria-selected="false">Tuntut Baki</a>
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab">
<table class="table" id="tableaddtunai">
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Debit</th>
<th>Kredit</th>
<th>Nota</th>
</tr>
</thead>
</table>
</div>
<div class="tab-pane fade" id="nav-profile" role="tabpanel" aria-labelledby="nav-profile-tab">
<table class="table" id="tablegadaitebus">
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Debit</th>
<th>Kredit</th>
<th>Nota</th>
</tr>
</thead>
</table>
</div>
<div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">
<table class="table" id="tabletuntutbaki">
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Debit</th>
<th>Kredit</th>
<th>Nota</th>
</tr>
</thead>
</table>
</div>
</div>
</div>
</div>
</div>
@@ -136,7 +182,15 @@
</div>
<script>
var tableaddtunai = $('#tableaddtunai').DataTable({
var tableaddtunai = $('#tableaddtunai').DataTable({
// "scrollX": true
});
var tableaddtunai = $('#tablegadaitebus').DataTable({
// "scrollX": true
});
var tableaddtunai = $('#tabletuntutbaki').DataTable({
// "scrollX": true
});
+95 -75
View File
@@ -882,6 +882,10 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "|";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Operasi.',
@@ -895,61 +899,68 @@
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('operasi.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan
// "teller" : teller,
// "dategadai" : dategadai,
// "bilgadai" : noic,
// "jumpinjam" : jumpinjam,
// "teller" : teller
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : jumpinjam,
"teller" : teller
},
success:function(data){
siricreated = data;
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
//TIME INTERVAL
let timerInterval;
timerInterval = setInterval(function(){
$.ajax({
method:'get',
url: "{{ route('operasi.getkelulusan') }}",
data: {
"norujukan" : norujukan
},
success:function(data){
if(data != '')
{
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Menerima Pengesahan'
}).then(function(){
var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
cluster: 'ap1',
encrypted: true
});
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
});
}
if(data.norujukan == norujukan && data.siri == siricreated)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan',
text: `Komen : ${data.komen}`
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
});
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}, 3000);
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
$("#terima_gadai").prop('disabled', false);
return false;
});
}
}
});
} else if (result.dismiss === Swal.DismissReason.cancel){
swalWithBootstrapButtons.fire(
'Batal',
@@ -983,6 +994,10 @@
if (result.isConfirmed) {
let norujukan = $('#norujukan').val();
let nm = $('#total_nilai_marhun').val();let ber = $('#total_berat').val();let marg = $('.span-pinjaman').text();
let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "|";
let jumpinjam = $('#pinjaman').val();
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.',
@@ -996,61 +1011,66 @@
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan
// "teller" : teller,
// "dategadai" : dategadai,
// "bilgadai" : noic,
// "jumpinjam" : jumpinjam,
// "teller" : teller
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : jumpinjam,
"teller" : teller
},
success:function(data){
siricreated = data;
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
//TIME INTERVAL
let timerInterval;
timerInterval = setInterval(function(){
$.ajax({
method:'get',
url: "{{ route('khazanah.getkelulusan') }}",
data: {
"norujukan" : norujukan
},
success:function(data){
if(data != '')
{
clearInterval(timerInterval);
Swal.fire({
icon: 'success',
title: 'Anda Berjaya Menerima Pengesahan'
}).then(function(){
var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
cluster: 'ap1',
encrypted: true
});
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
// let message = JSON.stringify(data);
});
}
// console.log(message);
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
if(data.norujukan == norujukan && data.siri == siricreated)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
$(func).attr("onSubmit","return true;");
$(func).submit();
return true;
});
}
});
}, 3000);
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan'
}).then(function(){
$("#terima_gadai").prop('disabled', false);
return false;
});
}
}
});
} else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire(
@@ -1,14 +1,161 @@
@extends('layouts.app')
@section('content')
<!-- Modal HistoryBayaran -->
<div class="modal fade" id="denominasiShowModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl" role="document">
<div class="modal-content">
<div class="modal-header">
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
</li>
</ul>
<label class="mt-2 ml-3">Bundle:</label><input type="text" class="form-control col-2 ml-3" id="amaunbundle" placeholder="0.00" readonly>
<label class="mt-2 ml-3">Keping:</label><input type="text" class="form-control col-2 ml-3" id="amaunkeping" placeholder="0.00" readonly>
<label class="mt-2 ml-3">Amaun:</label><input type="text" class="form-control col-2 ml-3" id="amaunkeseluruhan" placeholder="0.00" readonly>
<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="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<table class="table">
<tr>
<th></th>
<th>Ambilan</th>
<th>Total</th>
<th></th>
<th>Ambilan</th>
<th>Total (RM)</th>
</tr>
<tr>
<td>RM1</td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" readonly/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" readonly/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" readonly/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" readonly/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" readonly/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
<td>RM100 </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" readonly/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
</tr>
</table>
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<table class="table">
<tr>
<th></th>
<th>Ambilan</th>
<th>Total</th>
<th></th>
<th>Ambilan</th>
<th>Total (RM)</th>
</tr>
<tr>
<td>RM0.01</td>
<td><input type="text" name="ambilansen1" class="form-control" id="sen1" readonly/> </td>
<td><input type="text" name="totalsen1" id="totalsen1" class="form-control" value="0.00" readonly/> </td>
<td>RM1</td>
<td><input type="text" name="ambilanring1" class="form-control" id="ringgit1" readonly/> </td>
<td><input type="text" name="totalring1" id="totalring1" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.05</td>
<td><input type="text" name="ambilansen5" class="form-control" id="sen5" readonly/> </td>
<td><input type="text" name="totalsen5" id="totalsen5" class="form-control" value="0.00" readonly/> </td>
<td>RM5</td>
<td><input type="text" name="ambilanring5" class="form-control" id="ringgit5" readonly/> </td>
<td><input type="text" name="totalring5" id="totalring5" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.10</td>
<td><input type="text" name="ambilansen10" class="form-control" id="sen10" readonly/> </td>
<td><input type="text" name="totalsen10" id="totalsen10" class="form-control" value="0.00" readonly/> </td>
<td>RM10</td>
<td><input type="text" name="ambilanring10" class="form-control" id="ringgit10" readonly/> </td>
<td><input type="text" name="totalring10" id="totalring10" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.20</td>
<td><input type="text" name="ambilansen20" class="form-control" id="sen20" readonly/> </td>
<td><input type="text" name="totalsen20" id="totalsen20" class="form-control" value="0.00" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="ambilanring20" class="form-control" id="ringgit20" readonly/> </td>
<td><input type="text" name="totalring20" id="totalring20" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM0.50</td>
<td><input type="text" name="ambilansen50" class="form-control" id="sen50" readonly/> </td>
<td><input type="text" name="totalsen50" id="totalsen50" class="form-control" value="0.00" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="ambilanring50" class="form-control" id="ringgit50" readonly/> </td>
<td><input type="text" name="totalring50" id="totalring50" class="form-control" value="0.00" readonly/> </td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td>RM100 </td>
<td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" readonly/> </td>
<td><input type="text" name="totalring100" id="totalring100" class="form-control" value="0.00" readonly/> </td>
</tr>
</table>
</div>
</div>
<input type="hidden" id="jenisjenis"/>
<input type="hidden" id="kodcawangan"/>
<input type="hidden" id="tellerla"/>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Tutup</button>
</div>
</div>
</div>
</div>
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12">
<div class="card">
<div class="card-header">{{ __('Dashboard') }}</div>
<div class="card-body text-center">
<div class="row form-group justify-content-center">
<div class="col-3 mx-1">
<div class="row">
@@ -38,6 +185,9 @@
<div class="row">
<a href="{{ url('pendahuluanserahan') }}" class="btn btn-primary btn-lg btn-block mb-3">Pendahuluan - Serahan</a>
</div>
<div class="row">
<a href="#" data-target="#denominasiShowModal" data-toggle="modal" class="btn btn-primary btn-lg btn-block mb-3">Denominasi</a>
</div>
</div>
<div class="col-3 mx-1">
@@ -80,5 +230,83 @@
}
});
let api = "{{ config('api.url') }}";
let kodcaw = "{{ Auth::user()->cawangan }}";
$.ajax({
method: 'get',
url: api + '/api/DenominasiController/' + kodcaw,
success:function(data)
{
$.each(data, function(key,val) {
$('#bundle1').val(val.bd1);
$('#totalb1').val(val.b1);
$('#bundle20').val(val.bd20);
$('#totalb20').val(val.b20);
$('#bundle5').val(val.bd5);
$('#totalb5').val(val.b5);
$('#bundle50').val(val.bd50);
$('#totalb50').val(val.b50);
$('#bundle10').val(val.bd10);
$('#totalb10').val(val.b10);
$('#bundle100').val(val.bd100);
$('#totalb100').val(val.b100);
$('#sen1').val(val.txtsen1);
$('#totalsen1').val(val.k01);
$('#sen5').val(val.txtsen5);
$('#totalsen5').val(val.k05);
$('#sen10').val(val.txtsen10);
$('#totalsen10').val(val.k010);
$('#sen20').val(val.txtsen20);
$('#totalsen20').val(val.k020);
$('#sen50').val(val.txtsen50);
$('#totalsen50').val(val.k050);
$('#ringgit1').val(val.txtring1);
$('#totalring1').val(val.k1);
$('#ringgit5').val(val.txtring5);
$('#totalring5').val(val.k5);
$('#ringgit10').val(val.txtring10);
$('#totalring10').val(val.k10);
$('#ringgit20').val(val.txtring20);
$('#totalring20').val(val.k20);
$('#ringgit50').val(val.txtring50);
$('#totalring50').val(val.k50);
$('#ringgit100').val(val.txtring100);
$('#totalring100').val(val.k100);
$('#amaunkeping').val(val.jumlahkeping);
$('#amaunbundle').val(val.jumlahbundle);
$('#amaunkeseluruhan').val(val.txtjumlah);
});
}
});
</script>
@endsection
+288 -232
View File
@@ -14,210 +14,63 @@
<a href="{{ url('/') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
</div>
<div class="col-8 mt-3 justify-content-center">
<h3>Aliran Tunai - Peti Besi</h3>
<h3>Aliran Tunai</h3>
</div>
<div class="col-2">
</div>
<div class="col-12 justify-content-center d-flex">
<ul class="nav nav-pills mb-3 mt-2 " id="pills-tab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-Tunai" role="tab" aria-controls="pills-home" aria-selected="true">Tunai</a>
</li>
<li class="nav-item">
<a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-PetiBesi" role="tab" aria-controls="pills-profile" aria-selected="false">Peti Besi</a>
</li>
</ul>
</div>
</div>
<div class="container" id="exTab1">
{{-- {{ dd($arraytunai) }} --}}
<div class="tab-content" id="pills-tabContent">
<ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
@foreach($listUser as $index1=>$ls)
@if($index1 == 0)
<li class="nav-item">
<a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-home" aria-selected="true">{{ $ls->name }}</a>
</li>
@else
<li class="nav-item">
<a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-profile" aria-selected="false">{{ $ls->name }}</a>
</li>
{{-- <li class="nav-item">
<a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact" role="tab" aria-controls="pills-contact" aria-selected="false">Contact</a>
</li> --}}
@endif
<div class="tab-pane fade show active" id="pills-Tunai" role="tabpanel" aria-labelledby="pills-home-tab">
@endforeach
</ul>
<div class="tab-content" id="pills-tabContent">
<div class="container" id="exTab1">
@foreach($listUser as $index1=>$ls)
{{-- {{ dd(empty($arraytunai[1])) }} --}}
@if($index1 == 0)
<div class="tab-pane fade show active" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-home-tab">
{{-- {{ dd($arraytunai) }} --}}
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
<p>Tunai Diterima</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
<p>Tunai Dikeluar</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
<p>Baki Akhir Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
<p>Gadaian</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<p>Tebusan</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="mt-3">
<ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">
@foreach($listUser as $index1=>$ls)
<table class='table mt-4' id='table-{{ $ls->id }}' style="width:100%;">
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@if($index1 == 0)
<li class="nav-item">
<a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-home" aria-selected="true">{{ $ls->name }}</a>
</li>
@else
<li class="nav-item">
<a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-profile" aria-selected="false">{{ $ls->name }}</a>
</li>
@endif
</div>
@else
<div class="tab-pane fade" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-profile-tab">
@endforeach
</ul>
<div class="tab-content" id="pills-tabContent">
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
<p>Tunai Diterima</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
<p>Tunai Dikeluar</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="col-12 row">
@foreach($listUser as $index1=>$ls)
{{-- {{ dd(empty($arraytunai[1])) }} --}}
@if($index1 == 0)
<div class="tab-pane fade show active" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-home-tab">
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
<p>Baki Akhir Tunai</p>
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
</div>
@@ -228,9 +81,9 @@
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
<p>Gadaian</p>
<p>Tunai Diterima</p>
</div>
<div class="icon">
</div>
@@ -241,62 +94,261 @@
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
<p>Tebusan</p>
<p>Tunai Dikeluar</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
<p>Baki Akhir Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
<p>Gadaian</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<p>Tebusan</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="mt-3">
<table class='table mt-4' id='table-{{ $ls->id }}' style="width:100%;">
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
@foreach ($arraytunai[$index1] as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@else
<div class="tab-pane fade" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-profile-tab">
<div class="mt-3">
<table class='table mt-4' id='table-{{ $ls->id }}'>
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
{{-- {{ dd($arraytunai) }} --}}
@foreach ($arraytunai[$index1] as $tunai)
{{-- {{ dd($tunai) }} --}}
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
@endforeach
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}</h5>
<p>Baki Awal Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
<p>Tunai Diterima</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
<p>Tunai Dikeluar</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="col-12 row">
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}</h5>
<p>Baki Akhir Tunai</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}</h5>
<p>Gadaian</p>
</div>
<div class="icon">
</div>
</div>
</div>
<div class="col-lg-6 col-xl-4 col-12">
<!-- small box -->
<div class="small-box bg-primary">
<div class="inner">
<h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
<p>Tebusan</p>
</div>
<div class="icon">
</div>
</div>
</div>
</div>
<div class="mt-3">
<table class='table mt-4' id='table-{{ $ls->id }}'>
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Tunai Diterima</th>
<th>Tunai Dikeluar</th>
<th>Gadaian</th>
<th>Tebusan</th>
<th>Baki Akhir Tunai</th>
</tr>
</thead>
<tbody>
{{-- {{ dd($arraytunai) }} --}}
@foreach ($arraytunai[$index1] as $tunai)
{{-- {{ dd($tunai) }} --}}
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['tambah'] }}</td>
<td>{{ $tunai['kurang'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['baki'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
@endif
@endforeach
</div>
</div>
</div>
<div class="tab-pane fade" id="pills-PetiBesi" role="tabpanel" aria-labelledby="pills-profile-tab">
<table class='table mt-4' id='table-PetiBesi' style="width:100%;">
<thead>
<tr>
<th>bil</th>
<th>Tarikh</th>
<th>Baki Awal Tunai</th>
<th>Keluar</th>
<th>Masuk</th>
<th>Baki EOD</th>
<th>Baki Akhir Tunai</th>
<th>Pendahuluan</th>
<th>Serahan</th>
</tr>
</thead>
<tbody>
{{-- {{ dd($petibesi) }} --}}
@foreach ($petibesi as $tunai)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $tunai['tarikh'] }}</td>
<td>{{ $tunai['bakiawal'] }}</td>
<td>{{ $tunai['keluar'] }}</td>
<td>{{ $tunai['masuk'] }}</td>
<td>{{ $tunai['bakieod'] }}</td>
<td>{{ $tunai['bakiakhir'] }}</td>
<td>{{ $tunai['pendahuluan'] }}</td>
<td>{{ $tunai['serahan'] }}</td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@@ -309,6 +361,10 @@
// "scrollX": true
// });
var tablecapaian = $('#table-PetiBesi').DataTable({
});
let namefordatatable = "{{ $listUser }}";
console.log(namefordatatable);
+5 -1
View File
@@ -681,6 +681,10 @@
let pdbyr = 0;
let totalseparuh = 0;
console.log($('#jumlahupah').val());
console.log(bayaranseparuhasal);
console.log(byr);
if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){
$('#bayaran').val(bayaranseparuhasal.toFixed(2));
}else{
@@ -690,7 +694,7 @@
// pdbyr = parseFloat(byr);
pdbyr = $('#bayaran').val();
total = $('#pinjaman').val() - pdbyr;
total = $('#pinjaman').val().replace(/[^0-9.-]+/g,"") - pdbyr;
// $('#perludibayar').val(pdbyr);
$('#bakipinjaman').val(total.toFixed(2));