fix conflict
This commit is contained in:
MUHD HAFIFIE
@@ -108,7 +108,7 @@ class AliranTunaiController extends Controller
|
||||
$tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
|
||||
|
||||
$requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
|
||||
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
|
||||
$advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
|
||||
|
||||
// dd($advansur);
|
||||
//******************* INITIALIZE LEJER AM START HERE****************************//
|
||||
@@ -1098,7 +1098,7 @@ class AliranTunaiController extends Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
$jumlahBulan_ini_Upah=$get_GlejerBulan_Tahun[0]['jumlah'];
|
||||
$jumlahBulan_ini_Upah=$get_GlejerBulan_Tahun_Upah[0]['jumlah'];
|
||||
$jumlahBulan_ini_Upah=$jumlah_Upah-$jumlahBulan_ini_Upah;
|
||||
}//end bulan tahun
|
||||
$Jumlah_TahunIni_Upah=0.0;
|
||||
|
||||
@@ -4087,7 +4087,6 @@ class KhazanahController extends Controller
|
||||
if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
|
||||
if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
|
||||
if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
|
||||
|
||||
|
||||
$totalhartasemasa = 0;
|
||||
foreach($hartasemasa as $index => $hs)
|
||||
@@ -4118,8 +4117,7 @@ class KhazanahController extends Controller
|
||||
if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
|
||||
if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
|
||||
if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
|
||||
if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
|
||||
|
||||
if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
|
||||
|
||||
$totaltanggungansemasa = 0;
|
||||
foreach($tanggungansemasa as $index => $ts)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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) {
|
||||
|
||||
+1
-3
@@ -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 -->
|
||||
|
||||
Reference in New Issue
Block a user