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

server

Browse Source
This commit is contained in:
e.arrahn
2021-05-27 17:11:44 +08:00
parent 6801af71e5
commit f530ca2f6f
7 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+2 -2
View File
@@ -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' => $requestkodlaluan[0]['kodlaluan']])->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;
app/Http/Controllers/KhazanahController.php
+2 -2
View File
@@ -3361,6 +3361,7 @@ class KhazanahController extends Controller
$cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
$hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
//TunaiDitangan Sementara Upah
if($tarikh_imbangan2 > '2021-04-22' && $tarikh_imbangan2 < '2021-05-05' && $cawangan_detail['kodcaw'] == 'KB2')
@@ -3403,7 +3404,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)
@@ -3434,7 +3434,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]);
$totaltanggungansemasa = 0;
foreach($tanggungansemasa as $index => $ts)
resources/views/aliran_tunai/index.blade.php
+2 -2
View File
@@ -247,7 +247,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
@@ -343,4 +343,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
+17 -2
View File
@@ -131,8 +131,23 @@
$('#linkz').text(data.namateller + " Pohon Kelulusan");
$("#linkz").attr("href", "{{ url('kelulusan') }}");
audio.play();
audio.muted = false;
//audio.play();
//audio.muted = false;
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,
resources/views/operasi/kelulusan.blade.php
+14
View File
@@ -159,6 +159,20 @@
minimumFractionDigits: 2
});
var audio = new Audio("{{ asset('sound/3.wav') }}");
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) {
let button = $(event.relatedTarget);
let norujukan = $(button).data('norujukan');
resources/views/vendor/laravel-log-viewer/log.blade.php
Vendored
+2 -7
View File
@@ -5,10 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="robots" content="noindex, nofollow">
<title>Laravel log viewer</title>
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css">
<style>
body {
@@ -285,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 -->