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

fix all the bug

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/edit.blade.php
+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;
resources/views/gadaian/index.blade.php
+101 -4
View File
@@ -1,5 +1,7 @@
@extends('layouts.app')
@include('modal.editmarhun')
@section('content')
@php
$gadai_session = Http::get($api_url . '/api/check/sag',['kodcaw'=>$cawangan_info['kodcaw'],'norujukan'=>$norujukan,'nokp'=>$customer_info['kpbaru']])->json();
@@ -38,11 +40,14 @@
<thead>
<tr>
<th>Bil</th>
<th>Recno</th>
<th>Marhun</th>
<th>Nilai Marhun</th>
<th>Karat</th>
<th>Berat</th>
<th>Nota</th>
<th>Harga</th>
<th>Tindakan</th>
</tr>
</thead>
</table>
@@ -300,7 +305,19 @@
}
var tablemarhun = $('#myTable').DataTable({
"ordering": false
"ordering": false,
"columnDefs": [
{
"targets": [ 1 ],
"visible": false,
"searchable": false
},
{
"targets": [ 7 ],
"visible": false,
"searchable": false
}
]
});
$(".select2").select2({
@@ -329,11 +346,14 @@
marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +",";
tablemarhun.row.add([
counter,
marhun_detail['recno'],
marhun_detail['marhun'],
'RM ' + formatter.format(marhun_detail['n_marhun']),
marhun_detail['karat'],
formatter.format(marhun_detail['berat']),
marhun_detail['nota']
marhun_detail['nota'],
marhun_detail['harga'],
"<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();
counter = counter + 1;
});
@@ -666,6 +686,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.',
@@ -685,7 +709,10 @@
url: "{{ route('operasi.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : jumpinjam,
"teller" : teller
},
success:function(data){
console.log(data);
@@ -705,6 +732,7 @@
url: "{{ route('operasi.getkelulusan') }}",
data: {
"norujukan" : norujukan
},
success:function(data){
if(data != ''){
@@ -756,6 +784,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.',
@@ -775,7 +807,10 @@
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : jumpinjam,
"teller" : teller
},
success:function(data){
console.log(data);
@@ -844,5 +879,67 @@
});
}
}
function deletemarhun(e)
{
let marhun = $(e).closest('tr').children('td:eq(1)').text();let selectedrow = $(e).closest('tr');let recnozz = tablemarhun.row(selectedrow).data();
let norujuk = $('#norujukan').val();
$.ajax({
method: 'put',
url: '{{ route("gadai.editmarhun") }}',
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujuk,
"recno" : recnozz[1]
},
success:function(data)
{
console.log(data);
location.reload();
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}
function editmarhun(e)
{
let norujuk = $('#norujukan').val();let selectedrow = $(e).closest('tr');let recno = tablemarhun.row(selectedrow).data();
let nm = recno[3];let karat = recno[4];let berat = recno[5];
let harga = recno[7];
$('#sltkarat').val(karat);
$('#berat').val(berat);
$('#nilaimarhun').val(nm.substring(2));
$('#harga1').val(harga);
$('#norujukedit').val(norujuk);
$('#recno').val(recno[1]);
$('#editMarhunModal').modal();
}
$("#sltkarat").change(function(e){
let hargaref = $(this).find(':selected').data('harga');
let ber = parseFloat($('#berat').val());
let total = ber * hargaref;
$('#nilaimarhun').val(total.toFixed(2));
$('#harga1').val(hargaref);
});
function calculationharga(e)
{
let berat = $(e).val();
let total = 0;
let harga = $('#harga1').val();
total = berat * harga;
$('#nilaimarhun').val(total.toFixed(2));
}
</script>
@endsection