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

Merged in cherrypick/update_button_terima_gadai (pull request #174)

Browse Source 
Cherrypick/update button terima gadai
This commit is contained in:
nurulnisha muhammad
2024-07-08 14:09:40 +00:00
committed by Muhd hafifie
parent 03b5d70c6a 44f6946836
commit 705aee17db
3 changed files with 818 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+4 -1
View File
@@ -155,7 +155,10 @@ class GadaianController extends Controller
public function store(Request $request){ public function store(Request $request){
$auth_user = Auth::user(); $auth_user = Auth::user();
$total_nilai_marhun = $request->total_nilai_marhun; //$total_nilai_marhun = $request->total_nilai_marhun;
//need to get total nilai marhun by api get from table marhun
$marhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/gadai/'. $auth_user['cawangan'] .'/'. $request->norujukan_gadai)->json();
$total_nilai_marhun = $marhun;
$total_nilai_marhun = str_replace(',','',$total_nilai_marhun); $total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
$keuntungan_sebln = $request->keuntungan_sebulan; $keuntungan_sebln = $request->keuntungan_sebulan;
$keuntungan_sebln = str_replace(',','',$keuntungan_sebln); $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
resources/views/gadaian/v1/index.blade.php
+131 -2
View File
@@ -507,6 +507,26 @@
return false; return false;
}else{ }else{
if(bilangan_marhun_daftar<10){ if(bilangan_marhun_daftar<10){
//new added 190624 filter if gadaian already exist pinjaman not null
$.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) {
$("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -531,7 +551,6 @@
$('#harga').val(""); $('#harga').val("");
$('#nilai_marhun').val(""); $('#nilai_marhun').val("");
$('#daftar_marhun').modal('hide'); $('#daftar_marhun').modal('hide');
jumlah_marhun += 1; jumlah_marhun += 1;
jumlah_nilai_marhun += Number(nilai_marhun); jumlah_nilai_marhun += Number(nilai_marhun);
$('#bilangan_marhun').val(formatter.format(jumlah_marhun)); $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
@@ -549,6 +568,10 @@
console.log(xhRequest); console.log(xhRequest);
} }
}); });
}
}
});
}else{ }else{
$("#tambah_marhun").prop('disabled', false); $("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false);
@@ -619,6 +642,26 @@
return false; return false;
}else{ }else{
if(bilangan_marhun_daftar < 10){ if(bilangan_marhun_daftar < 10){
//new added 190624 filter if gadaian already registered pinjaman > 0
$.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) {
$("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -642,7 +685,6 @@
$('#berat_emas').val(""); $('#berat_emas').val("");
$('#harga').val(""); $('#harga').val("");
$('#nilai_marhun').val(""); $('#nilai_marhun').val("");
jumlah_marhun += 1; jumlah_marhun += 1;
jumlah_nilai_marhun += Number(nilai_marhun); jumlah_nilai_marhun += Number(nilai_marhun);
$('#bilangan_marhun').val(formatter.format(jumlah_marhun)); $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
@@ -660,6 +702,11 @@
console.log(xhRequest); console.log(xhRequest);
} }
}); });
}
}
});
//end new added 190624
}else{ }else{
$("#tambah_marhun").prop('disabled', false); $("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false);
@@ -797,6 +844,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 +987,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 +1133,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 +1170,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
+137
View File
@@ -723,6 +723,27 @@
} }
if(bilangan_marhun_daftar<10){ if(bilangan_marhun_daftar<10){
//new added 190624 filter if gadaian already exist pinjaman not null
$.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) {
$("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -776,6 +797,12 @@
console.log(xhRequest); console.log(xhRequest);
} }
}); });
}
}
});
//end new added 190624
}else{ }else{
$("#tambah_marhun").prop('disabled', false); $("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false);
@@ -871,6 +898,27 @@
} }
if(bilangan_marhun_daftar < 10){ if(bilangan_marhun_daftar < 10){
//new added 190624 filter if gadaian already registered pinjaman > 0
$.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) {
$("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false);
Swal.fire({
icon: 'error',
title: 'Tidak Berjaya',
text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
});
event.preventDefault();
return false;
} else {
$.ajax({ $.ajax({
method:'POST', method:'POST',
url: api_url + '/api/marhun/'+kodcaw, url: api_url + '/api/marhun/'+kodcaw,
@@ -926,6 +974,12 @@
console.log(xhRequest); console.log(xhRequest);
} }
}); });
}
}
});
//end new added 190624
}else{ }else{
$("#tambah_marhun").prop('disabled', false); $("#tambah_marhun").prop('disabled', false);
$("#terima_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false);
@@ -1169,6 +1223,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 +1365,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 +1511,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 +1549,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
} }
} }
} }