added one percent in the gadai platform and tebus platform
This commit is contained in:
Hafifie PKB
@@ -144,8 +144,8 @@
|
||||
<div class="card-body">
|
||||
<nav class="mb-3">
|
||||
<div class="nav nav-tabs" id="nav-tab" role="tablist">
|
||||
<a class="nav-item nav-link active" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="true">Tawarruq</a>
|
||||
<a class="nav-item nav-link" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="false">Ar-Rahn</a>
|
||||
<a class="nav-item nav-link active" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="true">SAG Baru</a>
|
||||
<a class="nav-item nav-link" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="false"><span id="textnavsag">SAG Lama</span></a>
|
||||
</div>
|
||||
</nav>
|
||||
<div class="tab-content" id="navtawarruqdannottawarruq">
|
||||
@@ -170,7 +170,7 @@
|
||||
<div class="tab-pane fade" id="nav-xtawarruq" role="tabpanel" aria-labelledby="nav-xtawarruq-tab">
|
||||
<table id="xtawarruq" class="table table-striped table-hover">
|
||||
<thead class="thead-dark">
|
||||
<tr>
|
||||
{{-- <tr>
|
||||
<th>Bil</th>
|
||||
<th>No Rujukan</th>
|
||||
<th>Tarikh Gadai</th>
|
||||
@@ -179,6 +179,18 @@
|
||||
<th>Margin</th>
|
||||
<th>Tempoh</th>
|
||||
<th>Lelong</th>
|
||||
</tr> --}}
|
||||
<tr>
|
||||
<th>Bil</th>
|
||||
<th>No Rujukan</th>
|
||||
<th>Tarikh Gadai</th>
|
||||
<th>Tarikh Matang</th>
|
||||
<th>Baki Harga Jualan</th>
|
||||
<th>Baki Pembiayaan</th>
|
||||
<th>Margin</th>
|
||||
<th>Tempoh</th>
|
||||
<th>Keuntungan</th>
|
||||
<th>Lelong</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
@@ -747,14 +759,23 @@
|
||||
tablelelong.clear().draw();
|
||||
xtawarruq.clear().draw();
|
||||
$.each(data,function(index,gadai_detail){
|
||||
let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
|
||||
$.ajax({
|
||||
method:'get',
|
||||
url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
|
||||
url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'] + '/' + jeniskeuntungan,
|
||||
success:function(upahsemasa){
|
||||
if(jenistebus == "belum_tebus"){
|
||||
var urlroute = '{{ route("penebusan", ":id") }}';
|
||||
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
|
||||
if(gadai_detail["bakihargajualan"] == null){
|
||||
|
||||
if(gadai_detail['lelong_tawarruq'] == 0){
|
||||
var tarikh_matang = gadai_detail['t_matang1'];
|
||||
}else{
|
||||
var tarikh_matang = gadai_detail['t_matang'];
|
||||
}
|
||||
|
||||
if(gadai_detail["tagbaru"] == 0){
|
||||
$('#textnavsag').addClass('text-danger');
|
||||
if(gadai_detail['taglel'] == 1){
|
||||
var taglel = '<b class="text-danger">Akan Dilelong</b>';
|
||||
}else{
|
||||
@@ -764,11 +785,13 @@
|
||||
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
|
||||
'<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||
gadai_detail['t_gadai'],
|
||||
gadai_detail['t_matang'],
|
||||
'RM '+formatter.format(gadai_detail['pinjaman']),
|
||||
tarikh_matang,
|
||||
'RM '+ formatter.format(gadai_detail['bakihargajualan']),
|
||||
'RM '+formatter.format(gadai_detail['bakipjm']),
|
||||
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
|
||||
gadai_detail['tempoh'],
|
||||
taglel,
|
||||
'RM '+ upahsemasa,
|
||||
'<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
|
||||
]).draw();
|
||||
}else{
|
||||
var taglel = '';
|
||||
@@ -799,11 +822,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
if(gadai_detail['lelong_tawarruq'] == 0){
|
||||
var tarikh_matang = gadai_detail['t_matang1'];
|
||||
}else{
|
||||
var tarikh_matang = gadai_detail['t_matang'];
|
||||
}
|
||||
tablegadai.row.add([
|
||||
'<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
|
||||
'<a href="#" onclick="checkserah(this)" data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
<!-- <form action="{{ route('gadai.store') }}" method='post' name="gadaistore" id="gadaistore"> -->
|
||||
@csrf
|
||||
<div class="col-12 form-group row">
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-5">
|
||||
<div class="form-group row">
|
||||
<div class="col-5">
|
||||
Pembiayaan Max
|
||||
@@ -116,11 +116,21 @@
|
||||
</div>
|
||||
</diV>
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<div class="col-3">
|
||||
<div class="form-group row">
|
||||
</diV>
|
||||
<div class="col-md-6">
|
||||
Ujrah
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" readonly name="ujrah" id="ujrah">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="col-1">
|
||||
<div class="form-group row">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-5">
|
||||
<div class="form-group row">
|
||||
<div class="col-5">
|
||||
Pembiayaan
|
||||
@@ -143,7 +153,18 @@
|
||||
</div>
|
||||
</diV>
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<div class="col-3">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-6">
|
||||
One Percent
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" readonly name="onepercent" id="onepercent">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-5"></div>
|
||||
<div class="col-6">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-6">
|
||||
Pembiayaan Max Pelulus
|
||||
@@ -394,13 +415,26 @@
|
||||
$('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
|
||||
$('#bilangan_marhun').val(formatter.format(counter-1));
|
||||
$('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
|
||||
if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
|
||||
kadarupah = 1.2/100;
|
||||
}else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
|
||||
kadarupah = 1.5/100;
|
||||
}else if(total_nilai_marhun >= 2001 ){
|
||||
kadarupah = 1.7/100;
|
||||
}
|
||||
// if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
|
||||
// kadarupah = 1.2/100;
|
||||
// }else if(total_nilai_marhun >= 401 && total_nilai_marhun < 2001){
|
||||
// kadarupah = 1.5/100;
|
||||
// }else if(total_nilai_marhun >= 2001 ){
|
||||
// kadarupah = 1.7/100;
|
||||
// }
|
||||
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api_url + '/api/kadarujrah',
|
||||
async:false,
|
||||
data:{
|
||||
'nilaimarhun' : total_nilai_marhun
|
||||
},
|
||||
success:function(data){
|
||||
kadarupah = data;
|
||||
}
|
||||
});
|
||||
|
||||
$('#total_nilai_marhun').val(formatter.format(total_nilai_marhun));
|
||||
$('#marhun_detail').val(marhun_details);
|
||||
$('#total_berat').val(formatter.format(total_berat));
|
||||
@@ -433,14 +467,37 @@
|
||||
var pinjaman = Number(this.value);
|
||||
var nilaimarhun = Number($('#jumlah_nilai_marhun').val());
|
||||
|
||||
var keuntungan_sebulan = pinjaman * kadarupah;
|
||||
var keuntungan_6bln = keuntungan_sebulan * 6;
|
||||
// var keuntungan_sebulan = pinjaman * kadarupah;
|
||||
// var keuntungan_6bln = keuntungan_sebulan * 6;
|
||||
|
||||
percent_pinjaman = (Number(pinjaman)/Number(total_nilai_marhun))*100;
|
||||
|
||||
let array_keuntungan = [];
|
||||
|
||||
$.ajax({
|
||||
method:'POST',
|
||||
url: api_url + '/api/onepercent',
|
||||
async:false,
|
||||
data:{
|
||||
'nilaimarhun' : total_nilai_marhun,
|
||||
'pembiayaan' : pinjaman,
|
||||
'kadarujrah' : kadarupah,
|
||||
'margin' : percent_pinjaman,
|
||||
},
|
||||
success:function(data){
|
||||
array_keuntungan = data;
|
||||
}
|
||||
});
|
||||
|
||||
var keuntungan_sebulan = array_keuntungan['keuntungan'];
|
||||
var keuntungan_6bln = keuntungan_sebulan * 6;
|
||||
|
||||
$('.span-pinjaman').text(formatter.format(percent_pinjaman.toFixed(2)) + ' %');
|
||||
$('#keuntungan_sebulan').val(formatter.format(keuntungan_sebulan.toFixed(2)));
|
||||
$('#keuntungan_6bln').val(formatter.format(keuntungan_6bln.toFixed(2)));
|
||||
$('#ujrah').val(formatter.format(array_keuntungan['ujrah'].toFixed(2)));
|
||||
$('#onepercent').val(formatter.format(array_keuntungan['onepercent'].toFixed(2)));
|
||||
|
||||
});
|
||||
|
||||
const formatter = new Intl.NumberFormat('en-US', {
|
||||
|
||||
@@ -67,12 +67,12 @@
|
||||
<div class="col-8">
|
||||
<select class="form-control" id="sltjenistebus">
|
||||
<option value="T">T = Tebus</option>
|
||||
@if($gadai['hargajualan'] != null)
|
||||
@if($gadai['tagbaru'] != 0)
|
||||
<option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran</option>
|
||||
<option value="S">S = Separuh</option>
|
||||
<option value="P">P = Tambah Pembiayaan</option>
|
||||
@endif
|
||||
@if($gadai['hargajualan'] == null)
|
||||
@else
|
||||
{{-- @if($gadai['tagbaru'] == 0) --}}
|
||||
<option value="AT">A = Auto Tawarruq</option>
|
||||
@endif
|
||||
</select>
|
||||
@@ -413,6 +413,7 @@
|
||||
|
||||
|
||||
var hargajualan = "{{ $gadai['hargajualan'] }}";
|
||||
var tagbaru = "{{ $gadai['tagbaru'] }}";
|
||||
|
||||
|
||||
var kodcaw = "{{ $gadai['kodcaw'] }}";
|
||||
@@ -476,9 +477,10 @@
|
||||
$('#histbtn').show();
|
||||
|
||||
//Upah Tawarruq
|
||||
let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal';
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
|
||||
url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#jumlahupah').val(data);
|
||||
@@ -487,7 +489,7 @@
|
||||
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan,
|
||||
url: api + '/api/upahrebettawarruq/' + kodcaw + '/' + norujukan + '/' + jeniskeuntungan,
|
||||
dataType: 'json',
|
||||
success:function(data){
|
||||
$('#bayaranditerima').val(data);
|
||||
@@ -620,11 +622,6 @@
|
||||
totalnilaimarhunseparuh += parseFloat(value);
|
||||
});
|
||||
|
||||
// console.log("TOTAL HARGA SEMASA :" + totalmarhunhargasemasa);
|
||||
// console.log("TOTAL HARGA SEMASA SPEARUH :" + totalnilaimarhunseparuh);
|
||||
// console.log("YANG DIAMBIL :" + nilaimarhunhargasemasa);
|
||||
|
||||
|
||||
if(numbernotchecked != totalCheckboxes){
|
||||
|
||||
// console.log(nmsemasa);
|
||||
@@ -1104,6 +1101,15 @@
|
||||
jenisbayarantebus = "tawarruq";
|
||||
}
|
||||
|
||||
//tambahan untuk one percent
|
||||
let jeniskeuntungan = '';
|
||||
if(tagbaru == 1){
|
||||
jeniskeuntungan = "onepercent";
|
||||
}
|
||||
else{
|
||||
jeniskeuntungan = "asal";
|
||||
}
|
||||
|
||||
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
|
||||
var jenistebus = $('#sltjenistebus').find(":selected").val();
|
||||
var jbg = "{{ $gadai['tempoh'] }}";
|
||||
@@ -1139,6 +1145,7 @@
|
||||
"marhun" : marhun,
|
||||
"nowakil" : nowakil,
|
||||
"jenisbayarantebus" : jenisbayarantebus,
|
||||
"jeniskeuntungan" : jeniskeuntungan,
|
||||
"teller" : teller
|
||||
},
|
||||
success:function(success_data){
|
||||
@@ -2350,16 +2357,29 @@
|
||||
var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,""));
|
||||
|
||||
var kadarupahbaru = 0;
|
||||
if(nilai_marhun > 0 && nilai_marhun < 400.99){
|
||||
kadarupahbaru = 1.20/100;
|
||||
}else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
|
||||
kadarupahbaru = 1.50/100;
|
||||
}else if(nilai_marhun >= 2001 ){
|
||||
kadarupahbaru = 1.70/100;
|
||||
}
|
||||
// if(nilai_marhun > 0 && nilai_marhun < 400.99){
|
||||
// kadarupahbaru = 1.20/100;
|
||||
// }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
|
||||
// kadarupahbaru = 1.50/100;
|
||||
// }else if(nilai_marhun >= 2001 ){
|
||||
// kadarupahbaru = 1.70/100;
|
||||
// }
|
||||
|
||||
var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
|
||||
var keuntungan_6bln = keuntungan_sebulan * 6;
|
||||
$.ajax({
|
||||
method:'GET',
|
||||
url: api + '/api/kadarujrah',
|
||||
async:false,
|
||||
data:{
|
||||
'nilaimarhun' : nilai_marhun
|
||||
},
|
||||
success:function(data){
|
||||
kadarupahbaru = data;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
|
||||
// var keuntungan_6bln = keuntungan_sebulan * 6;
|
||||
|
||||
$.ajax({
|
||||
method:"GET",
|
||||
@@ -2389,8 +2409,8 @@
|
||||
"total_nilai_marhun" : nilai_marhun,
|
||||
"pinjaman" : pinjamanbaru,
|
||||
"kadarkeuntungan" : kadarupahbaru,
|
||||
"keuntungan_6bln" : keuntungan_6bln,
|
||||
"keuntungan_sebulan" : keuntungan_sebulan,
|
||||
// "keuntungan_6bln" : keuntungan_6bln,
|
||||
// "keuntungan_sebulan" : keuntungan_sebulan,
|
||||
"total_berat" : total_berat,
|
||||
"marhun_detail" : marhun,
|
||||
"kuantiti_marhun" : kuantiti_marhun,
|
||||
|
||||
Reference in New Issue
Block a user