fix all the bug

This commit is contained in:
hafifierahman
2021-01-31 08:39:15 +08:00
parent c58c0dbc39
commit 86758cfbe1
18 changed files with 1209 additions and 151 deletions
+63 -42
View File
@@ -20,32 +20,9 @@
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
Jumlah Pembiayaan Semasa
</div>
<div class="col-md-8">
@php
$outstanding_semasa = Http::get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa')->json();
@endphp
<input type="text" class="form-control" name="pinjaman_semasa" id="pinjaman_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
</div>
</div>
</div>
<div class="col-md-4">
<div class="form-group row">
<div class="col-md-4">
Limit Pembiayaan Semasa
</div>
<div class="col-md-8">
<input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ $limit_pinjaman_semasa }}">
</div>
</div>
</div>
</div>
<div class="col-12 text-right mb-2">
<button type="button" style="margin:auto" id="daft" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
<button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_marhun">Daftar Marhun</button>
</div>
<div class="card">
<div class="card-body">
@@ -120,8 +97,7 @@
<div class="col-7 input-group">
<input type="text" class="form-control" name="pinjaman" value="{{ $gadaiannorujukan['pinjaman'] }}" id="pinjaman">
<div class="input-group-append">
@php $percentpinjam = ($gadaiannorujukan['pinjaman']/$gadaiannorujukan['nilaimarhun'])*100; @endphp
<span class="input-group-text span-pinjaman">{{ number_format((float)$percentpinjam,2) }}%</span>
<span class="input-group-text span-pinjaman"></span>
</div>
</div>
</diV>
@@ -156,8 +132,8 @@
<input type="text" name="kadarkeuntungan" id="kadarkeuntungan" value="" hidden>
<input type="text" name="kuantiti_marhun" id="kuantiti_marhun" value="" hidden>
<input type="text" name="total_nilai_marhun" id="total_nilai_marhun" value="" hidden>
{{-- <a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a> --}}
<a href="{{ route('gadai.batalmarhun',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a>
<a href="{{ route('customer_info') }}" class="float-right btn btn-danger mr-2">Batal</a>
{{-- <a href="{{ route('gadai.batalmarhun',['norujukan'=>$norujukan]) }}" class="float-right btn btn-danger mr-2">Batal</a> --}}
<input type="submit" name="terima_gadai" id="terima_gadai" class="float-right btn btn-primary mr-2" value="Terima">
</div>
</div>
@@ -206,7 +182,7 @@
<div class="col-md-4">Berat</div>
<div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas"></div>
<div class="col-md-4">Harga</div>
<div class="col-md-8"><input class="form-control" type="text" name="harga" id="harga" readonly></div>
<div class="col-md-8"><input class="form-control .harga" type="text" name="harga" id="harga" readonly></div>
<div class="col-md-4">Nilai Marhun</div>
<div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
<div class="col-md-4">Bilangan Marhun</div>
@@ -249,6 +225,30 @@
function disableF5(e) { if ((e.which || e.keyCode) == 116) e.preventDefault(); };
$(document).ready( function () {
$.ajax({
method: 'get',
url: api_url + '/api/marhun/' + "{{ $norujukan }}",
success:function(data)
{
let count = 0;
let jumlah = 0;
$.each(data,function(index,marhun)
{
$.each(marhun,function(index,mar)
{
jumlah += Number(mar['n_marhun']);
count++;
})
})
$('#bilangan_marhun').val(count);
$('#jumlah_nilai_marhun').val(formatter.format(jumlah));
}
});
$(document).on("keydown", disableF5);
var norujukan = $('#norujukan').val();
getMarhun(norujukan);
@@ -289,6 +289,7 @@
var karat = this.value;
karat = karat.replace(/\./g,'-');
var berat = $('#berat_emas').val();
alert(karat);
getHargaEmas(karat,berat)
});
@@ -315,10 +316,15 @@
method:'GET',
url: api_url + '/api/harga_emas/'+karat,
success:function(data){
var nilai_marhun = data['harga'] * berat;
$('#harga').val(data['harga']);
$('#harga').val(formatter.format(data['harga']));
$('#nilai_marhun').val(formatter.format(nilai_marhun));
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(err.Message);
console.log(err.Message);
}
})
}
@@ -354,6 +360,7 @@
var jumlah_nilai_marhun = 0;
function marhuntable(data){
var counter = 1;
var count = 0;
total_nilai_marhun = 0;
total_berat = 0;
var marhun_details = '';
@@ -372,12 +379,20 @@
formatter.format(marhun_detail['berat']),
marhun_detail['nota'],
marhun_detail['harga'],
"<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button>"
"<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
]).draw();
count++;
counter = counter + 1;
});
});
if (count == 1)
{
$('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
}
if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
kadarupah = 1.25/100;
}else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
@@ -391,6 +406,14 @@
$('#kadarkeuntungan').val(formatter.format(kadarupah));
$('#kuantiti_marhun').val(formatter.format(jumlah_marhun));
let perpinjam = ($('#pinjaman').val()/total_nilai_marhun)*100;
let keuntungan_sebulan = $('#pinjaman').val() * kadarupah;
let keuntungan_6bln = keuntungan_sebulan * 6;
$('.span-pinjaman').text(formatter.format(perpinjam.toFixed(2)) + ' %');
$('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
$('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
$.ajax({
method:'GET',
url: api_url + '/api/maxpinjaman',
@@ -448,30 +471,28 @@
$('#sltkarat').val(karat);
$('#berat').val(berat);
$('#nilaimarhun').val(nm);
$('#harga').val(harga);
$('#nilaimarhun').val(nm.substring(2));
$('#harga1').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#editMarhunModal').modal();
}
// $( "#daft" ).one( "click", function() {
// alert( "This will be displayed only once." );
// });
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
$('#berat').attr('readonly', false);
$('#harga').val(hargaref);
let ber = parseFloat($('#berat').val());
let total = ber * hargaref;
// $('#berat').attr('readonly', false);
$('#nilaimarhun').val(total.toFixed(2));
$('#harga1').val(hargaref);
});
function calculationharga(e)
{
let berat = $(e).val();
let total = 0;
let harga = $('#harga').val();
let harga = $('#harga1').val();
total = berat * harga;