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

fix conflict

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-05-27 17:43:39 +08:00
parent 9358acd83e 493de641a4
commit f7e456e24c
7 changed files with 58 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/aliran_tunai/index.blade.php
+2 -2
View File
@@ -256,7 +256,7 @@
<td> {{ $loop->iteration }} </td>
<td> {{ $ansur['tarikh'] }} </td>
<td> {{ $ansur['norujukan'] }} </td>
<td> {{ number_format($ansur['upahdibayar'],2) }} </td>
<td> {{ number_format($ansur['upahDibayar'],2) }} </td>
</tr>
@endforeach
@endif
@@ -352,4 +352,4 @@
let laporanroute = "{{ route('laporan.serahanteller') }}";
</script>
<script src="{{ asset('js/main.js') }}"></script>
@endsection
@endsection
resources/views/customers/index.blade.php
+27 -27
View File
@@ -827,33 +827,33 @@
return false;
}
}else if(id_type=='passport'){
if(nokp.length < 5){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Periksa Passport Pelanggan'
});
event.preventDefault();
return false;
}
if(nokp.indexOf(' ') > 0){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)'
});
event.preventDefault();
return false;
}
if(regex.test(nokp) == false){
Swal.fire({
icon: 'error',
title: 'Amaran!',
text: 'Sila Periksa Passport Pelanggan'
});
event.preventDefault();
return false;
}
// if(nokp.length < 5){
// Swal.fire({
// icon: 'error',
// title: 'Amaran!',
// text: 'Sila Periksa Passport Pelanggan'
// });
// event.preventDefault();
// return false;
// }
// if(nokp.indexOf(' ') > 0){
// Swal.fire({
// icon: 'error',
// title: 'Amaran!',
// text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)'
// });
// event.preventDefault();
// return false;
// }
// if(regex.test(nokp) == false){
// Swal.fire({
// icon: 'error',
// title: 'Amaran!',
// text: 'Sila Periksa Passport Pelanggan'
// });
// event.preventDefault();
// return false;
// }
}
}
</script>
resources/views/layouts/app_operasi.blade.php
+14 -16
View File
@@ -131,22 +131,20 @@
$('#linkz').text(data.namateller + " Pohon Kelulusan");
$("#linkz").attr("href", "{{ url('kelulusan') }}");
if(window.location.pathname === '/operasi/kelulusan')
{
location.reload();
}else{
audio.play();
audio.muted = false;
var countlagu = 1;
audio.onended = function() {
if(countlagu <= 3){
countlagu++;
console.log(countlagu);
this.play();
}
}
}
if(window.location.pathname === '/operasi/kelulusan')
{
location.reload();
}else{
audio.play();
audio.muted = false;
var countlagu = 1;
audio.onended = function() {
if(countlagu <= 3){
countlagu++;
this.play();
}
}
}
const Toast = Swal.mixin({
toast: true,
position: 'top-end',
resources/views/operasi/kelulusan.blade.php
+11 -14
View File
@@ -159,21 +159,18 @@
minimumFractionDigits: 2
});
var audio = new Audio("{{ asset('sound/3.wav') }}");
// audio.muted = true;
var audio = new Audio("{{ asset('sound/3.wav') }}");
if (tablekelulusan.data().any()) {
audio.play();
audio.addEventListener('ended', function() {
this.currentTime = 0;
this.play();
}, false);
console.log('betul');
}else{
audio.loop = false;
audio.muted = true;
}
if(tablekelulusan.data().any()){
audio.play();
audio.addEventListener('ended', function() {
this.currentTime = 0;
this.play();
}, false);
}else{
audio.loop = false;
audio.muted = true;
}
$('#kelulusanmodal').on('show.bs.modal', function(event) {
resources/views/vendor/laravel-log-viewer/log.blade.php
Vendored
+1 -3
View File
@@ -282,9 +282,7 @@
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
<!-- FontAwesome -->
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<!-- Datatables -->