perubahan dari segi alirantunai upah semua la okay?

This commit is contained in:
fifi97
2021-06-24 03:25:25 +08:00
parent 4be155da22
commit 2cf9635244
18 changed files with 1228 additions and 1588 deletions
@@ -28,7 +28,8 @@
<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="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</form>
@@ -40,17 +41,16 @@
<thead class="thead-dark">
<tr>
<th>Bil</th>
<th>Nama</th>
<th width="22%">Nama</th>
<th>No K/P</th>
<th>No Rujukan</th>
<th>Tarikh Tebus</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Bayaran (RM)</th>
</tr>
</thead>
<tfoot class="thead-dark">
<th colspan="5">TOTAL</th>
<th colspan="4">TOTAL</th>
<th id="pinjamantotal"></th>
<th id="keuntungantotal"></th>
<th id="bayarantotal"></th>
@@ -76,30 +76,31 @@
"ordering": true
});
$(document).ready( function () {
$('#datetimepicker1').datepicker({
$('#datetarikh').datepicker({
format: 'dd-mm-yyyy'
});
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;
var today_date = current_year + '-' + current_month + '-' + current_date;
$.ajax({
method:'get',
url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
url: api_url + '/api/tebus/laporan/' +kodcaw+ '/' + today_date,
success: function(tebus){
tebustable(tebus);
}
});
});
$('#datetimepicker1').change(function(){
$('#datetarikh').change(function(){
var input_date = this.value;
var split_date = input_date.split('-');
var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
var today_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
$.ajax({
method:'get',
url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
url: api_url + '/api/tebus/laporan/' + kodcaw + '/' + today_date,
success: function(tebus){
tebustable(tebus);
}
@@ -110,7 +111,6 @@
});
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
@@ -120,40 +120,62 @@
var total_pinjaman = 0;
var total_keuntungan = 0;
var total_bayaran = 0;
console.log(data);
tabletebus.clear().draw();
$.each(data,function(index,tebus){
$.ajax({
url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
method:'get',
success:function(gadai){
$.ajax({
url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
method:'get',
success:function(customer){
total_pinjaman += parseFloat(tebus['pinjaman']);
total_keuntungan += parseFloat(tebus['bakiupah']);
total_bayaran += parseFloat(tebus['bakipjm']);
tabletebus.row.add([
counter,
customer['nama'],
gadai[0][0]['nokp'],
tebus['norujukan'],
tebus['t_tebus'],
formatter.format(tebus['pinjaman']),
formatter.format(tebus['bakiupah']),
formatter.format(tebus['bakipjm'])
]).draw();
counter = counter + 1;
$('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
$('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
$('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
}
});
}
});
total_pinjaman += parseFloat(tebus['pinjaman']);
total_keuntungan += parseFloat(tebus['bakiupah']);
total_bayaran += parseFloat(tebus['bakipjm']);
tabletebus.row.add([
counter,
tebus['nama'],
tebus['nokp'],
tebus['norujukan'],
formatter.format(tebus['pinjaman']),
formatter.format(tebus['bakiupah']),
formatter.format(tebus['bakipjm'])
]).draw();
counter = counter + 1;
$('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
$('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
$('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
});
// $.each(data,function(index,tebus){
// $.ajax({
// url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
// method:'get',
// success:function(gadai){
// $.ajax({
// url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
// method:'get',
// success:function(customer){
// total_pinjaman += parseFloat(tebus['pinjaman']);
// total_keuntungan += parseFloat(tebus['bakiupah']);
// total_bayaran += parseFloat(tebus['bakipjm']);
// tabletebus.row.add([
// counter,
// customer['nama'],
// gadai[0][0]['nokp'],
// tebus['norujukan'],
// tebus['t_tebus'],
// formatter.format(tebus['pinjaman']),
// formatter.format(tebus['bakiupah']),
// formatter.format(tebus['bakipjm'])
// ]).draw();
// counter = counter + 1;
// $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
// $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
// $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
// }
// });
// }
// });
// });
// console.log('Total Pinjam : ' + total_pinjaman);
// $('#jumlah_pinjaman').text('RM '+ total_pinjaman);