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

resolve conflict

Browse Source
This commit is contained in:
afiq
2021-02-25 05:30:23 +08:00
parent 1e65336028 3cd5711973
commit 21a026e6b3
17 changed files with 2043 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/customers/info.blade.php
+45 -35
View File
@@ -627,27 +627,27 @@
if($("input[name='options']:checked").val() == 'belum_tebus'){
let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
if(+harini !== +tarikhgadai2){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Ubah Gadai Tidak Dibenarkan'
});
return false;
}
// if(+harini !== +tarikhgadai2){
// Swal.fire({
// icon: 'error',
// title: 'Amaran',
// text: 'Ubah Gadai Tidak Dibenarkan'
// });
// return false;
// }
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
if(+harini !== +tarikhgadai1){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Ubah Gadai Tidak Dibenarkan'
});
return false;
}
// if(+harini !== +tarikhgadai1){
// Swal.fire({
// icon: 'error',
// title: 'Amaran',
// text: 'Ubah Gadai Tidak Dibenarkan'
// });
// return false;
// }
}
if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
@@ -719,19 +719,21 @@
}
});
//TIME INTERVAL
let timerInterval;
var pusher = new Pusher('26b0ec2f297f94b7aa9b', {
cluster: 'ap1',
encrypted: true
});
timerInterval = setInterval(function(){
$.ajax({
method:'get',
url: "{{ route('teller.getkelulusan') }}",
data: {
"norujukan" : ubahid
},
success:function(data){
if(data != 0){
clearInterval(timerInterval);
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
console.log(data);
if(data.norujukan == ubahid)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
@@ -739,20 +741,28 @@
var urlroute = '{{ route("gadaian.edit", ":id") }}';
urlroute = urlroute.replace(':id', ubahid);
window.location.replace(urlroute);
return true;
});
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
// $("#terima_gadai").prop('disabled', false);
return false;
});
}
}
});
}, 3000);
}else if (result.dismiss === Swal.DismissReason.cancel){
swalWithBootstrapButtons.fire(
'Batal',