diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index a4d0f2f..54e5b99 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -172,6 +172,7 @@
| Pembiayaan |
Margin |
Tempoh |
+ Lelong |
@@ -716,6 +717,11 @@
var urlroute = '{{ route("penebusan", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail["bakihargajualan"] == null){
+ if(gadai_detail['taglel'] == 1){
+ var taglel = 'Akan Dilelong';
+ }else{
+ var taglel = '';
+ }
xtawarruq.row.add([
'',
'' + gadai_detail['norujukan'] + '',
@@ -723,7 +729,8 @@
gadai_detail['t_matang'],
'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
- gadai_detail['tempoh']
+ gadai_detail['tempoh'],
+ taglel,
]).draw();
}else{
tablegadai.row.add([
@@ -1596,7 +1603,7 @@
}
else {
- return false;
+ return false;
$.ajax({
method:'get',
@@ -1742,7 +1749,7 @@
Swal.fire({
icon: 'error',
title: 'Amaran',
- text: 'Hapus Gadai Tidak Dibenarkan'
+ text: 'Hapus Tebus Tidak Dibenarkan'
});
return false;
}
@@ -1779,14 +1786,16 @@
allowEnterKey: false
})
- let mohon = "Hapus Gadai";
+ let mohon = "";
let id = 0;
if($("input[name='options']:checked").val() == 'belum_tebus'){
id = hapusid;
+ mohon = "Hapus Gadai";
}
else if($("input[name='options']:checked").val() == 'sudah_tebus'){
id = hapusidsudah;
+ mohon = "Hapus Tebus";
}
$.ajax({
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 08eea38..a664daf 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -769,7 +769,7 @@
return false;
}
else{
- if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman >= 10000){
+ if(pinjaman > Number(pembiyaan_max_pelulus) || pinjaman >= 10000){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
@@ -778,7 +778,7 @@
buttonsStyling: false
});
- if(pinjaman > Number(pembiyaan_max_pelulus)+10){
+ if(pinjaman > Number(pembiyaan_max_pelulus)){
var errortext = "Tetapan margin melebihi 75% untuk Operasi!";
}
if(pinjaman >= 10000){
@@ -888,7 +888,7 @@
});
event.preventDefault();
return false;
- }else if(pinjaman > Number(pembiayaan_max_teller)+10){
+ }else if(pinjaman > Number(pembiayaan_max_teller)){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 91d1d5f..934f6ed 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -224,7 +224,7 @@
-
+
+
@@ -386,6 +395,7 @@
$('#divperludibayartawarruq').hide();
$('#divbayarantawarruq').hide();
$('#divbayaran').hide();
+ $("#divbayaranminima").hide();
var array_recno = [];
@@ -422,6 +432,7 @@
var jumlahperlu = 0;
var jumlahminima = 0;
+ var percent_mora = 0;
$( document ).ready(function() {
@@ -435,6 +446,15 @@
return /^\d*\.?(?:\d{1,2})?$/.test(value); // Allow digits only, using a RegExp
});
+ $.ajax({
+ method:'get',
+ datatype:'json',
+ url:api + '/api/moratorium/details',
+ success:function(data){
+ percent_mora = data['percent_mora'];
+ }
+ })
+
});
function tebusan(){
@@ -735,6 +755,7 @@
$('#divperludibayartawarruq').hide();
$('#divbayarantawarruq').hide();
$('#divbayaran').hide();
+ $("#divbayaranminima").hide();
$('#divtelahdibayar').show();
$('#divperludibayar').show();
@@ -762,6 +783,7 @@
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').hide();
+ $("#divbayaranminima").hide();
$('#bayaran').val(formatter.format(jumupah));
@@ -787,6 +809,7 @@
$('#divtelahdibayar').show();
$('#divbayaran').show();
$('#divperludibayar').show();
+ $("#divbayaranminima").hide();
$('#perludibayar').val(formatter.format(jumupahrebet));
break;
@@ -807,18 +830,29 @@
$('#divbayaran').hide();
$('#divperludibayar').hide();
$('#divbayarantawarruq').hide();
+ $("#divbayaranminima").hide();
$("#bayaran").prop("disabled", false);
$("#bayaran").val(0);
break;
case "U":
- $("#terima_transaksi").prop('disabled', false);
-
+ if(jumupah <= 0){
+ $("#terima_transaksi").prop('disabled', true);
+ }else{
+ $("#terima_transaksi").prop('disabled', false);
+ }
$('input[type="checkbox"]').hide();
$('span.spannar').show();
-
+ var taglel = "{{ $gadai['taglel'] }}";
+ var minimum_bayaran = (percent_mora/100)*jumupah;
$("#bayaran").prop("disabled", false);
- $("#perludibayar").prop("readonly", true);
+ if(taglel == 1){
+ $("#perludibayar").prop("readonly", false);
+ $("#divbayaranminima").show();
+ }else{
+ $("#perludibayar").prop("readonly", true);
+ $("#divbayaranminima").hide();
+ }
$("#bayaran").val(0);
$('#divtambahpinjaman').hide();
@@ -831,7 +865,7 @@
$('#divtelahdibayar').hide();
$('#divbayaran').hide();
$('#divperludibayar').show();
-
+ $('#minimabayaran').val(formatter.format(minimum_bayaran));
$('#perludibayar').val(formatter.format(jumupah));
break;
case "AT":
@@ -840,6 +874,7 @@
$('input[type="checkbox"]').hide();
$('span.spannar').show();
$('#divpinjaman').show();
+ $("#divbayaranminima").hide();
$('#divtambahpinjaman').hide();
$('#divpinjamanbaru').show();
$('#divbayaranditerima').hide();
@@ -1786,53 +1821,77 @@
var marhun = "{{ $gadai['marhun'] }}";
var nowakil = nw;
- $.ajax({
- method:'post',
- url: api + '/api/ansuran/create/' + kodcaw,
- datatype: 'json',
- data:{
- 'norujukan' : norujukan,
- 'nopelanggan' : nopelanggan,
- 'nilaimarhun' : nilai_marhun,
- 'pinjaman' : pinjaman,
- 'kadarupah' : kadarupah,
- 'glcode' : "1000/010",
- 'upahsebenar' : bakipinjaman,
- 'upahdibayar' : bakipinjaman,
- 'teller' : teller,
- 'prkod' : prkod,
- 'jbg' : jbg,
- 'nowakil' : 0,
- 'hubungan' : 0,
- 'historygadaian' : norujukan
- },
- success:function(data){
+ var minimum_bayaran = (percent_mora/100)*bakiupah;
+ if(bakipinjaman >= minimum_bayaran){
+ if(bakipinjaman > bakiupah){
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire({
+ icon: 'error',
+ title: 'Bayaran Melebihi Dari Maksima',
+ text: 'Bayaran Maksima Adalah Upah Semasa'
+ });
+ event.preventDefault();
+ return false;
+ }else{
$.ajax({
- method: 'put',
- url: "{{ route('alirantunai.advansur') }}",
- async:false,
- data:{
+ method:'post',
+ url: api + '/api/ansuran/create/' + kodcaw,
+ datatype: 'json',
+ data:{
'norujukan' : norujukan,
- "_token": "{{ csrf_token() }}"
+ 'nopelanggan' : nopelanggan,
+ 'nilaimarhun' : nilai_marhun,
+ 'pinjaman' : pinjaman,
+ 'kadarupah' : kadarupah,
+ 'glcode' : "1000/010",
+ 'upahsebenar' : bakiupah,
+ 'upahdibayar' : bakipinjaman,
+ 'teller' : teller,
+ 'prkod' : prkod,
+ 'jbg' : jbg,
+ 'nowakil' : 0,
+ 'hubungan' : 0,
+ 'historygadaian' : norujukan
},
success:function(data){
- console.log(data);
- }, error: function(xhr, status, error) {
- var err = eval("(" + xhr.responseText + ")");
- alert(xhr.responseText);
- }
- });
+ $.ajax({
+ method: 'put',
+ url: "{{ route('alirantunai.advansur') }}",
+ async:false,
+ data:{
+ 'norujukan' : norujukan,
+ "_token": "{{ csrf_token() }}"
+ },
+ success:function(data){
+ console.log(data);
+ }, error: function(xhr, status, error) {
+ var err = eval("(" + xhr.responseText + ")");
+ alert(xhr.responseText);
+ }
+ });
- Swal.fire({
- icon: 'success',
- title: 'Berjaya!',
- text: 'Pembayaran Upah Berjaya',
- }).then(function() {
- window.open(urlroute, '_blank');
- window.location.replace("{{ route('customer_info') }}");
+ Swal.fire({
+ icon: 'success',
+ title: 'Berjaya!',
+ text: 'Pembayaran Upah Berjaya',
+ }).then(function() {
+ window.open(urlroute, '_blank');
+ window.location.replace("{{ route('customer_info') }}");
+ })
+ }
})
}
- })
+ }else{
+ $("#terima_transaksi").prop('disabled', false);
+ Swal.fire({
+ icon: 'error',
+ title: 'Bayaran Kurang Dari Minimum',
+ text: 'Bayaran minimum adalah '+percent_mora+' %'
+ });
+ event.preventDefault();
+ return false;
+ }
+
}else if($('#sltjenistebus').find(":selected").val() == 'AT'){
@@ -1846,7 +1905,7 @@
var marginsemasa = pinjaman_baru/nmsemasa * 100;
- $.ajax({
+ $.ajax({
method:'get',
url: api + '/api/komuditi/check',
success:function(komoditi){