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

fix aliran tunai fix penebusan

Browse Source
This commit is contained in:
hafifierahman
2021-02-09 11:22:56 +08:00
parent 4a89aa13d3
commit 0ee3c888d2
22 changed files with 7138 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/penebusan/index.blade.php
+109 -56
View File
@@ -293,6 +293,12 @@ var array_nm = [];
var array_marhun = [];
var array_berat = [];
//max bayaran
let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}");
let totalmarhun = jumlahasalmarhun;
let bayaranseparuhasal = 0;
let bilangan_marhun = Number("{{ $count }}");
bilmarhun = () => {
@@ -436,9 +442,16 @@ function tebusan()
if(tarikhgadai >= tarikhtawarruq)
{
//Separuh Bayar Tawarruq
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
//Separuh Bayar Tawarruq
$(document).on('click', '#checkmarhun', function(e) {
var totalCheckboxes = $('input[type="checkbox"]').length;
let numbernotchecked = $("input:checkbox:not(:checked)").length;
var recno = $(this).data('recno');
var nilaimarhun = $(this).data('nm');
var marhun = $(this).data('marhun');
@@ -450,7 +463,10 @@ if(tarikhgadai >= tarikhtawarruq)
array_marhun.push(marhun);
array_berat.push(berat);
totalmarhun = totalmarhun - parseFloat(nilaimarhun);
console.log("Nilai Marhun: " + nilaimarhun);
console.log("Max Bayaran Marhun: " + totalmarhun);
console.table(array_recno);
}
else{
@@ -464,43 +480,50 @@ if(tarikhgadai >= tarikhtawarruq)
array_marhun.splice(rmmarhun);
array_berat.splice(rmberat);
console.log("Nilai Marhun: " + rmnilai);
totalmarhun = totalmarhun + parseFloat(nilaimarhun);
console.log("Nilai Marhun: " + nilaimarhun);
console.log("Max Bayaran Marhun: " + totalmarhun);
console.table(array_recno[0]);
}
$.ajax({
method:'GET',
url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
data:{
"array_recno" : array_recno
},
success:function(success){
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
let bakihargajual = $('#bakihargajualan').val();
if(numbernotchecked != totalCheckboxes)
{
console.log('masuk');
$.ajax({
method:'GET',
url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan,
dataType: 'json',
data:{
"array_recno" : array_recno
},
success:function(success){
let bayarz = $('#bayaran').val(Number(success.toFixed(2)));
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
bayaranseparuhasal = Number(success.toFixed(2));
let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
$('#bakipinjaman').val(totalbakipinjam.toFixed(2));
let bakihargajual = $('#bakihargajualan').val();
}
});
$('#perludibayar').val(Number(success.toFixed(2)) + parseFloat($('#jumlahupah').val()));
let totalbakipinjam = parseFloat($('#pinjaman').val()) - success;
$('#bakipinjaman').val(totalbakipinjam.toFixed(2));
},error:function(xhr, textStatus, errorThrown){
console.log(xhr.responseText);
console.log(textStatus);
}
});
}
else
{
$('#perludibayar').val(parseFloat($('#jumlahupah').val()));
$('#bakipinjaman').val(0);
$('#bayaran').val(0);
}
});
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
if (checkedOne == false) {
$('#perludibayar').val(0);
}
else
{
$('#perludibayar').val(0);
}
}
else if(tarikhgadai < tarikhtawarruq){
//Separuh Bayar Bukan Tawarruq
@@ -534,6 +557,7 @@ if(tarikhgadai >= tarikhtawarruq)
var rmmarhun = array_marhun.findIndex(z => z == marhun);
var rmberat = array_berat.findIndex(a => a == berat);
array_recno.splice(rm);
array_nm.splice(rmnilai);
array_marhun.splice(rmmarhun);
@@ -663,7 +687,6 @@ $("#sltjenistebus").change(function(){
});
function bayarkey(e)
{
@@ -672,12 +695,28 @@ function bayarkey(e)
let byr = $(e).val();
let total = 0;
let pdbyr = 0;
pdbyr = parseFloat(byr) + parseFloat($('#jumlahupah').val());
let totalseparuh = 0;
console.log(byr);
console.log(bayaranseparuhasal);
if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val())))
{
$('#bayaran').val(bayaranseparuhasal.toFixed(2));
}
else
{
totalseparuh = byr - parseFloat($('#jumlahupah').val());
$('#bayaran').val(totalseparuh.toFixed(2));
}
// pdbyr = parseFloat(byr);
pdbyr = $('#bayaran').val();
total = $('#pinjaman').val() - pdbyr;
// $('#perludibayar').val(pdbyr);
$('#bakipinjaman').val(total);
$('#bakipinjaman').val(total.toFixed(2));
}
}
@@ -734,6 +773,7 @@ function bayarpinjam(e)
}
let teller = "{{ Auth::user()->name }}";
function bayaransemua()
{
@@ -787,24 +827,11 @@ function bayaransemua()
"historygadaian" : historygadaian,
"marhun" : marhun,
"nowakil" : nowakil,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){
// $.ajax({
// method: 'put',
// datatype: 'json', ///////untuk kegunaaan aliran tunai penebusan je testing
// url: api + '/api/',
// data:{
// },
// success:function(data)
// {
// success la
// }
// });
Swal.fire({
icon: 'success',
title: 'Berjaya!',
@@ -856,13 +883,18 @@ function bayaransemua()
$.ajax({
method:'PUT',
url: api + '/api/gadai/' + kodcaw + '/norujukan/' + norujukan,
method:'get',
url: "{{ route('bayaran.ansuranstawarruq') }}",
data:{
"bayaran" : bayar
"bayaran" : bayar,
"kodcaw" : kodcaw,
"norujukan" : norujukan,
"teller" : teller
},
success:function(success_data){
console.log(success_data);
var urlroute = '{{ route("resit.ansurans", ":id") }}';
urlroute = urlroute.replace(':id', norujukan);
@@ -959,7 +991,8 @@ function bayaransemua()
"keuntungan_sebulan" : keuntungan_sebulan,
"kuantiti_marhun" : kuantiti_marhun,
"lebihan" : lebihan,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){
@@ -992,7 +1025,10 @@ function bayaransemua()
jenisbayarantebus = "tawarruq";
}
if($('#perludibayar').val() < $('#bayaran').val())
console.log("perlu dibayar: " + $('#perludibayar').val());
console.log("bayaran : " + (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())));
if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
{
Swal.fire(
'Amaran!',
@@ -1002,6 +1038,19 @@ function bayaransemua()
return false;
}
let maxbayaran = totalmarhun * 0.1;
if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50)
{
Swal.fire(
'Amaran!',
`Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
'error'
)
return false;
}
//checked box
var checkboxes = document.querySelectorAll('input[type="checkbox"]');
var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
@@ -1016,6 +1065,8 @@ function bayaransemua()
return false;
}
alert('masuk');
return false;
var sumnilaimarhun = 0;
var sumberat = 0;
@@ -1079,7 +1130,7 @@ function bayaransemua()
var pinjamanbaru = $('#bakipinjaman').val();
var ansuran = 0;
var addpinjaman = 0;
var bakipinjaman = $('#bakipinjaman').val();
var bakipinjaman = $('#perludibayar').val();
var bakiupah = 0;
var historygadaian = "{{ $gadai['norujukan'] }}";
var marhun = "{{ $gadai['marhun'] }}";
@@ -1133,6 +1184,7 @@ function bayaransemua()
"nowakil" : nowakil,
"arrayrecno" : array_recno,
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller,
//yang baru
@@ -1275,7 +1327,8 @@ function bayaransemua()
"keuntungan_sebulan" : keuntungan_sebulan,
"noic" : noic,
"norujukan" : norujukan,
"jenisbayarantebus" : jenisbayarantebus
"jenisbayarantebus" : jenisbayarantebus,
"teller" : teller
},
success:function(success_data){