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

Fix conflict

Browse Source
This commit is contained in:
nurulnisha
2024-06-30 12:13:03 +08:00
parent 87970e8802
commit f01c0ccdb2
2 changed files with 633 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/gadaian/v1/index.blade.php
+82
View File
@@ -797,6 +797,27 @@
} }
else{ else{
if(pinjaman >= 10000 && pinjaman <= Number(pembiyaan_max_pelulus)){ if(pinjaman >= 10000 && pinjaman <= Number(pembiyaan_max_pelulus)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
//insert code asal
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -919,7 +940,34 @@
}); });
event.preventDefault(); event.preventDefault();
return false; return false;
//end insert code asal
}
}
});
//end new added
}else if(pinjaman > Number(pembiayaan_max_teller)){ }else if(pinjaman > Number(pembiayaan_max_teller)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
//insert code asal
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -1038,8 +1086,34 @@
}); });
event.preventDefault(); event.preventDefault();
return false; return false;
//end insert code asal
}
}
});
//end new added
} }
else if( pinjaman < 10000 && pinjaman <= Number(pembiayaan_max_teller)){ else if( pinjaman < 10000 && pinjaman <= Number(pembiayaan_max_teller)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Berjaya!', title: 'Berjaya!',
@@ -1049,6 +1123,14 @@
$(func).attr("onSubmit","return true;"); $(func).attr("onSubmit","return true;");
$(func).submit(); $(func).submit();
return true; return true;
}
}
});
//end new added
} }
} }
} }
resources/views/gadaian/v2/index.blade.php
+83
View File
@@ -1169,6 +1169,26 @@
} }
else{ else{
if(pinjaman >= 10000 && pinjaman <= Number(pembiyaan_max_pelulus)){ if(pinjaman >= 10000 && pinjaman <= Number(pembiyaan_max_pelulus)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
//insert code asal
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -1291,7 +1311,34 @@
}); });
event.preventDefault(); event.preventDefault();
return false; return false;
//end insert code asal
}
}
});
//end new added
}else if(pinjaman > Number(pembiayaan_max_teller)){ }else if(pinjaman > Number(pembiayaan_max_teller)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
//insert code asal
const swalWithBootstrapButtons = Swal.mixin({ const swalWithBootstrapButtons = Swal.mixin({
customClass: { customClass: {
confirmButton: 'btn btn-success', confirmButton: 'btn btn-success',
@@ -1410,8 +1457,35 @@
}); });
event.preventDefault(); event.preventDefault();
return false; return false;
//end insert code asal
}
}
});
//end new added
} }
else if( pinjaman < 10000 && pinjaman <= Number(pembiayaan_max_teller)){ else if( pinjaman < 10000 && pinjaman <= Number(pembiayaan_max_teller)){
//new added
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
success:function(data)
{
var checking = Object.keys(data[0]).length;
if (data[0]['pinjaman'] > 0) {
$("#terima_gadai").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
//insert code asal
Swal.fire({ Swal.fire({
icon: 'success', icon: 'success',
title: 'Berjaya!', title: 'Berjaya!',
@@ -1421,6 +1495,15 @@
$(func).attr("onSubmit","return true;"); $(func).attr("onSubmit","return true;");
$(func).submit(); $(func).submit();
return true; return true;
//end insert code asal
}
}
});
//end new added
} }
} }
} }