Merge branch 'lapfix' into 'new-super'
fix kelulusan text See merge request online-sistem1/kaunter!173
This commit is contained in:
Afiq Zakwan Hamdan
@@ -37,7 +37,7 @@ class OperasiController extends Controller
|
|||||||
{
|
{
|
||||||
foreach($lulus['kelulusanall'] as $index=>$kel)
|
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']]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -300,38 +300,34 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// var { value: komenkelulusan } = await Swal.fire({
|
var { value: komenkelulusan } = await Swal.fire({
|
||||||
// title: 'Masukkan Komen!',
|
title: 'Masukkan Komen!',
|
||||||
// input: 'radio',
|
input: 'radio',
|
||||||
// customClass: {
|
customClass: {
|
||||||
// input: 'custom-radio'
|
input: 'custom-radio'
|
||||||
// },
|
},
|
||||||
// inputOptions: {
|
inputOptions: {
|
||||||
// 'Pelanggan Baru': 'Pelanggan Baru',
|
'Pelanggan Baru': 'Pelanggan Baru',
|
||||||
// 'Pelanggan Tetap': 'Pelanggan Tetap',
|
'Pelanggan Tetap': 'Pelanggan Tetap',
|
||||||
// 'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
|
'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
|
||||||
// 'Lain2': 'Lain-Lain'
|
'Lain2': 'Lain-Lain'
|
||||||
// },
|
},
|
||||||
// confirmButtonText: 'Hantar',
|
confirmButtonText: 'Hantar',
|
||||||
// showCancelButton:false,
|
showCancelButton:false,
|
||||||
// allowOutsideClick: false
|
allowOutsideClick: false
|
||||||
// })
|
})
|
||||||
|
|
||||||
// if(komenkelulusan === 'Lain2')
|
if(komenkelulusan === 'Lain2')
|
||||||
// {
|
{
|
||||||
// var { value: komenkelulusan } = await Swal.fire({
|
var { value: komenkelulusan } = await Swal.fire({
|
||||||
// title: 'Masukkan Komen!',
|
title: 'Masukkan Komen!',
|
||||||
// input: 'text',
|
input: 'text',
|
||||||
// inputPlaceholder: 'Komen',
|
inputPlaceholder: 'Komen',
|
||||||
// confirmButtonText: 'Hantar',
|
confirmButtonText: 'Hantar',
|
||||||
// showCancelButton:false,
|
showCancelButton:false,
|
||||||
// allowOutsideClick: false
|
allowOutsideClick: false
|
||||||
// });
|
});
|
||||||
// }
|
}
|
||||||
|
|
||||||
|
|
||||||
// console.log(komenkelulusan);
|
|
||||||
// return false;
|
|
||||||
|
|
||||||
|
|
||||||
let teller = $(e).closest('tr').children('td:eq(1)').text();
|
let teller = $(e).closest('tr').children('td:eq(1)').text();
|
||||||
@@ -358,7 +354,7 @@
|
|||||||
"norujukan" : norujukan,
|
"norujukan" : norujukan,
|
||||||
"pelulus" : pelulus,
|
"pelulus" : pelulus,
|
||||||
"siri" : siri,
|
"siri" : siri,
|
||||||
"komen" : komen,
|
"komen" : komenkelulusan,
|
||||||
"margin" : marg,
|
"margin" : marg,
|
||||||
"nilaimarhun" : nm,
|
"nilaimarhun" : nm,
|
||||||
"berat" : ber,
|
"berat" : ber,
|
||||||
@@ -421,33 +417,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
var { value: komenkelulusan } = await Swal.fire({
|
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!',
|
title: 'Masukkan Komen!',
|
||||||
input: 'text',
|
input: 'text',
|
||||||
inputPlaceholder: 'Komen',
|
inputPlaceholder: 'Komen',
|
||||||
confirmButtonText: 'Hantar',
|
confirmButtonText: 'Hantar',
|
||||||
showCancelButton:false,
|
showCancelButton:false,
|
||||||
allowOutsideClick: false
|
allowOutsideClick: false
|
||||||
});
|
})
|
||||||
}
|
|
||||||
|
|
||||||
let teller = $(e).closest('tr').children('td:eq(1)').text();
|
let teller = $(e).closest('tr').children('td:eq(1)').text();
|
||||||
let norujukan = $(e).data('norujukan');
|
let norujukan = $(e).data('norujukan');
|
||||||
|
|||||||
@@ -110,6 +110,7 @@
|
|||||||
<th>No Rujukan</th>
|
<th>No Rujukan</th>
|
||||||
<th>Cawangan</th>
|
<th>Cawangan</th>
|
||||||
<th>Teller</th>
|
<th>Teller</th>
|
||||||
|
<th>Komen</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Nilai Pembiayaan</th>
|
<th>Nilai Pembiayaan</th>
|
||||||
<th>Nilai Marhun</th>
|
<th>Nilai Marhun</th>
|
||||||
@@ -124,6 +125,7 @@
|
|||||||
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
|
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-kodcawangan="{{ $k['cawangankod'] }}" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
|
||||||
<td>{{ $k['cawangan'] }}</td>
|
<td>{{ $k['cawangan'] }}</td>
|
||||||
<td>{{ $k['namateller'] }}</td>
|
<td>{{ $k['namateller'] }}</td>
|
||||||
|
<th>{{ $k['komen'] }}</th>
|
||||||
<td>{{ $k['status'] }}</td>
|
<td>{{ $k['status'] }}</td>
|
||||||
<td>{{ number_format($k['pinjaman'],2) }}</td>
|
<td>{{ number_format($k['pinjaman'],2) }}</td>
|
||||||
<td>{{ $k['nilaimarhun'] }}</td>
|
<td>{{ $k['nilaimarhun'] }}</td>
|
||||||
@@ -301,34 +303,43 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var { value: komenkelulusan } = await Swal.fire({
|
// var { value: komenkelulusan } = await Swal.fire({
|
||||||
title: 'Masukkan Komen!',
|
// title: 'Masukkan Komen!',
|
||||||
input: 'radio',
|
// input: 'radio',
|
||||||
customClass: {
|
// customClass: {
|
||||||
input: 'custom-radio'
|
// input: 'custom-radio'
|
||||||
},
|
// },
|
||||||
inputOptions: {
|
// inputOptions: {
|
||||||
'Pelanggan Baru': 'Pelanggan Baru',
|
// 'Pelanggan Baru': 'Pelanggan Baru',
|
||||||
'Pelanggan Tetap': 'Pelanggan Tetap',
|
// 'Pelanggan Tetap': 'Pelanggan Tetap',
|
||||||
'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
|
// 'Rekod Gadaian Baik': 'Rekod Gadaian Baik',
|
||||||
'Lain2': 'Lain-Lain'
|
// 'Lain2': 'Lain-Lain'
|
||||||
},
|
// },
|
||||||
confirmButtonText: 'Hantar',
|
// confirmButtonText: 'Hantar',
|
||||||
showCancelButton:false,
|
// showCancelButton:false,
|
||||||
allowOutsideClick: false
|
// allowOutsideClick: false
|
||||||
})
|
// })
|
||||||
|
|
||||||
if(komenkelulusan === 'Lain2')
|
// if(komenkelulusan === 'Lain2')
|
||||||
{
|
// {
|
||||||
var { value: komenkelulusan } = await Swal.fire({
|
// var { value: komenkelulusan } = await Swal.fire({
|
||||||
|
// title: 'Masukkan Komen!',
|
||||||
|
// input: 'text',
|
||||||
|
// inputPlaceholder: 'Komen',
|
||||||
|
// confirmButtonText: 'Hantar',
|
||||||
|
// showCancelButton:false,
|
||||||
|
// allowOutsideClick: false
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
const { value: komenkelulusan } = await Swal.fire({
|
||||||
title: 'Masukkan Komen!',
|
title: 'Masukkan Komen!',
|
||||||
input: 'text',
|
input: 'text',
|
||||||
inputPlaceholder: 'Komen',
|
inputPlaceholder: 'Komen',
|
||||||
confirmButtonText: 'Hantar',
|
confirmButtonText: 'Hantar',
|
||||||
showCancelButton:false,
|
showCancelButton:false,
|
||||||
allowOutsideClick: false
|
allowOutsideClick: false
|
||||||
});
|
})
|
||||||
}
|
|
||||||
|
|
||||||
let norujukan = $(e).data('norujukan');
|
let norujukan = $(e).data('norujukan');
|
||||||
let cawangankod = $(e).data('kodcaw');
|
let cawangankod = $(e).data('kodcaw');
|
||||||
@@ -406,7 +417,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
const { value: komenkelulusan } = await Swal.fire({
|
const { value: komenkelulusan } = await Swal.fire({
|
||||||
title: 'Masukkan Komen Daripada Khazanah',
|
title: 'Masukkan Komen',
|
||||||
input: 'text',
|
input: 'text',
|
||||||
inputPlaceholder: 'Komen',
|
inputPlaceholder: 'Komen',
|
||||||
confirmButtonText: 'Hantar',
|
confirmButtonText: 'Hantar',
|
||||||
|
|||||||
Reference in New Issue
Block a user