fixing deletependser and mohon

This commit is contained in:
hafifierahman
2021-10-02 09:54:31 +08:00
parent 2e41e124e4
commit 0ed748a0cc
13 changed files with 421 additions and 124 deletions
+71 -30
View File
@@ -111,7 +111,7 @@
<tr>
<th>No Rujukan</th>
<th>Teller</th>
<th>Komen</th>
<th>Status</th>
<th>Nilai Pembiayaan (RM)</th>
<th>Nilai Marhun (RM)</th>
<th>Berat</th>
@@ -120,13 +120,12 @@
</tr>
</thead>
<tbody>
@foreach($arraykelulusan as $index=>$k)
{{-- {{ dd($k) }} --}}
@foreach($kelulusan as $index=>$k)
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $k['norujukan'] }}">{{ $k['norujukan'] }} </a></td>
<td>{{ $k['namateller'] }}</td>
<td>{{ $k['komen'] }}</td>
<td>{{ number_format($k['pinjaman'],2) }}</td>
<td>{{ $k['teller'] }}</td>
<td>{{ $k['status'] }}</td>
<td>{{ number_format($k['jumpinj'],2) }}</td>
<td>{{ $k['nilaimarhun'] }}</td>
<td>{{ $k['berat'] }}</td>
<td>{{ $k['margin'] }}</td>
@@ -134,8 +133,7 @@
<button class="btn btn-danger" data-norujukan="{{ $k['norujukan'] }}" data-pelulus="{{ $k['pelulus'] }}" data-siri="{{ $k['siri'] }}" onclick="updatebatal(this)"><i class="fas fa-thumbs-down"></i></button></td>
</tr>
@endforeach
@foreach($arraykelulusanmohonid as $index=>$km)
@foreach($kelulusanmohonid as $index=>$km)
<tr>
<td><a href="#" data-toggle="modal" data-target="#kelulusanmodal" data-norujukan="{{ $km['norujukan'] }}">{{ $km['norujukan'] }} </a></td>
<td>{{ $km['teller'] }}</td>
@@ -302,29 +300,48 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen!',
// input: 'checkbox',
// inputPlaceholder: 'Komen',
input: 'radio',
inputOptions: {
'#ff0000': 'Red',
'#00ff00': 'Green',
'#0000ff': 'Blue'
},
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;
return false;
let teller = $(e).closest('tr').children('td:eq(1)').text();
let nm = $(e).closest('tr').children('td:eq(4)').text();
let ber = $(e).closest('tr').children('td:eq(5)').text();
let marg = $(e).closest('tr').children('td:eq(6)').text();
let komen = komenkelulusan + '|' + nm + "|" + ber + "|" + marg + "|";
// let komen = komenkelulusan + '|' + nm + "|" + ber + "|" + marg + "|";
let komen = '';
let norujukan = $(e).data('norujukan');
let pelulus = $(e).data('pelulus');
@@ -341,9 +358,13 @@
"norujukan" : norujukan,
"pelulus" : pelulus,
"siri" : siri,
'komen' : komen,
'namakhazanah' : namakhazanah,
'teller' : teller
"komen" : komen,
"margin" : marg,
"nilaimarhun" : nm,
"berat" : ber,
"status" : status,
"namakhazanah" : namakhazanah,
"teller" : teller
},
success:function(data){
Swal.fire({
@@ -399,14 +420,34 @@
return false;
}
const { value: komenkelulusan } = await Swal.fire({
title: 'Masukkan Komen Daripada Khazanah',
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');
@@ -27,7 +27,7 @@
@endphp
<div class="col-12 d-flex justify-content-end" style="visibility: hidden;">
<div class="col-12 d-flex justify-content-end">
<button class="btn btn-danger fas fa-trash-alt" onclick="togglepadam();"></button>
</div>
@@ -50,7 +50,7 @@
<td>{{ $gldetail['descpt'] }}</td>
<td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
<td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
@if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-minus-square"></button></td>@else<td></td> @endif
@if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser(this);" data-pend="{{ $gldetail['pendahuluan'] }}" data-ser="{{ $gldetail['serahan'] }}" data-recno="{{ $gldetail['recno'] }}" class="btn btn-danger fas fa-minus-square"></button></td>@else<td></td> @endif
</tr>
@endforeach
</tbody>
@@ -139,8 +139,20 @@
column.visible(!column.visible());
}
function deletependser()
function deletependser(e)
{
let rec_no = $(e).data('recno');
let pend = $(e).data('pend');
let ser = $(e).data('ser');
let jenisserahan = '';
if(pend > 0)
{
jenisserahan = 'pendahuluan';
}else{
jenisserahan = 'serahan';
}
Swal.fire({
title: 'Adakah anda pasti?',
text: "Anda tidak dapat untuk mengembalinya kembali!",
@@ -152,11 +164,32 @@
confirmButtonText: 'Teruskan!'
}).then((result) => {
if (result.isConfirmed) {
Swal.fire(
'Deleted!',
'Your file has been deleted.',
'success'
)
$.ajax({
method: 'post',
url: '{{ route("khazanah.deletependser") }}',
data: {
"_token": "{{ csrf_token() }}",
'recno' : rec_no,
'jenisserahan' : jenisserahan
},
success:function(data){
if(data === 'berjaya')
{
location.reload();
}else{
Swal.fire(
'Tidak Berjaya!',
'Data tidak berjaya dihapuskan.',
'error'
)
}
}
});
}
});
}