diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 0d78e01..d535646 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -37,7 +37,7 @@ class OperasiController extends Controller { foreach($lulus['kelulusanall'] as $index=>$kel) { - array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]); + array_push($arraykelulusan,["cawangan" => $lulus['cawangan'], "cawangankod" => $lulus['cawangankod'],"namateller" => $kel['teller'], 'siri' => $kel['siri'] , "norujukan" => $kel['norujukan'], 'pinjaman' => $kel['jumpinj'],'komen' => $kel['komen'], 'nilaimarhun' => ($kel['nilaimarhun'] ?? '-'), 'berat' => ($kel['berat'] ?? '-'),'margin' => ($kel['margin'] ?? '-'), 'status' => ($kel['status'] ?? '-'), 'pelulus' => $kel['pelulus']]); } } diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 64d14f1..2b7e9cf 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -300,38 +300,34 @@ return false; } - // var { value: komenkelulusan } = await Swal.fire({ - // title: 'Masukkan Komen!', - // input: 'radio', - // customClass: { - // input: 'custom-radio' - // }, - // inputOptions: { - // 'Pelanggan Baru': 'Pelanggan Baru', - // 'Pelanggan Tetap': 'Pelanggan Tetap', - // 'Rekod Gadaian Baik': 'Rekod Gadaian Baik', - // 'Lain2': 'Lain-Lain' - // }, - // confirmButtonText: 'Hantar', - // showCancelButton:false, - // allowOutsideClick: false - // }) + var { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen!', + input: 'radio', + customClass: { + input: 'custom-radio' + }, + inputOptions: { + 'Pelanggan Baru': 'Pelanggan Baru', + 'Pelanggan Tetap': 'Pelanggan Tetap', + 'Rekod Gadaian Baik': 'Rekod Gadaian Baik', + 'Lain2': 'Lain-Lain' + }, + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }) - // if(komenkelulusan === 'Lain2') - // { - // var { value: komenkelulusan } = await Swal.fire({ - // title: 'Masukkan Komen!', - // input: 'text', - // inputPlaceholder: 'Komen', - // confirmButtonText: 'Hantar', - // showCancelButton:false, - // allowOutsideClick: false - // }); - // } - - - // console.log(komenkelulusan); - // return false; + if(komenkelulusan === 'Lain2') + { + var { value: komenkelulusan } = await Swal.fire({ + title: 'Masukkan Komen!', + input: 'text', + inputPlaceholder: 'Komen', + confirmButtonText: 'Hantar', + showCancelButton:false, + allowOutsideClick: false + }); + } let teller = $(e).closest('tr').children('td:eq(1)').text(); @@ -358,7 +354,7 @@ "norujukan" : norujukan, "pelulus" : pelulus, "siri" : siri, - "komen" : komen, + "komen" : komenkelulusan, "margin" : marg, "nilaimarhun" : nm, "berat" : ber, @@ -421,33 +417,13 @@ } var { value: komenkelulusan } = await Swal.fire({ - title: 'Masukkan Komen!', - input: 'radio', - customClass: { - input: 'custom-radio' - }, - inputOptions: { - 'Pelanggan Baru': 'Pelanggan Baru', - 'Pelanggan Tetap': 'Pelanggan Tetap', - 'Rekod Gadaian Baik': 'Rekod Gadaian Baik', - 'Lain2': 'Lain-Lain' - }, - confirmButtonText: 'Hantar', - showCancelButton:false, - allowOutsideClick: false - }) - - if(komenkelulusan === 'Lain2') - { - var { value: komenkelulusan } = await Swal.fire({ title: 'Masukkan Komen!', input: 'text', inputPlaceholder: 'Komen', confirmButtonText: 'Hantar', showCancelButton:false, allowOutsideClick: false - }); - } + }) let teller = $(e).closest('tr').children('td:eq(1)').text(); let norujukan = $(e).data('norujukan'); diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 276ae47..129ed4a 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -110,6 +110,7 @@