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

fix skit2

Browse Source
This commit is contained in:
fifi97
2021-08-20 02:50:27 +08:00
parent 2e25e0d918
commit 567c8fe681
6 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/khazanah/alirantunai.blade.php
+12 -12
View File
@@ -272,12 +272,12 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table table-striped table-hover text-center" id="tableaddtunai-{{ $ls->id }}">
<thead class="thead-dark">
@@ -307,12 +307,12 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
<thead class="thead-dark">
@@ -347,12 +347,12 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
<thead class="thead-dark">
@@ -539,12 +539,12 @@
<div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table text-center table-striped table-hover" id="tableaddtunai-{{ $ls->id }}">
@@ -576,12 +576,12 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
@@ -617,12 +617,12 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
<div class="input-group mb-3 col-4" style="margin-left:-15px;">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div>
</div> --}}
<table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
resources/views/khazanah/laporan/tuntutbaki.blade.php
+11 -12
View File
@@ -49,11 +49,9 @@
</tr>
</thead>
<tfoot class="thead-dark">
<th colspan="3">TOTAL</th>
<th id="pinjamantotal"></th>
<th id="upah12total"></th>
<th id="nmtotal"></th>
<th id="berattotal"></th>
<th colspan="5">TOTAL</th>
<th id="totalcajlelong"></th>
<th id="totaljumlah"></th>
</tfoot>
</table>
</div>
@@ -116,15 +114,14 @@
function gadaitable(data){
var counter = 1;
var total_pinjaman = 0;
var total_upah12 = 0;
var total_nm = 0;
var total_berat = 0;
var totaljumlah = 0;
var totalcajlelong = 0;
tabletuntutbaki.clear().draw();
$.each(data,function(index,tb){
totaljumlah += tb['jumlah'];
totalcajlelong += tb['cajlelong'];
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + tb['norujukan'],
@@ -136,14 +133,16 @@
tabletuntutbaki.row.add([
counter,
customer[0]['nama'],
customer['nama'],
gadai[0][0]['nokp'],
tb['norujukan'],
tb['teller'],
tb['cajlelong'],
tb['jumlah']
]).draw();
counter = counter + 1;
$('#totalcajlelong').text(formatter.format(totalcajlelong));
$('#totaljumlah').text(formatter.format(totaljumlah));
}
});
}