diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 65c86a1..7223d50 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -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;
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 87b9f32..9ae89f5 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -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)
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 7a4deb2..15c35db 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -247,7 +247,7 @@
| {{ $loop->iteration }} |
{{ $ansur['tarikh'] }} |
{{ $ansur['norujukan'] }} |
- {{ number_format($ansur['upahdibayar'],2) }} |
+ {{ number_format($ansur['upahDibayar'],2) }} |
@endforeach
@endif
@@ -343,4 +343,4 @@
let laporanroute = "{{ route('laporan.serahanteller') }}";
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 90e1d89..4c0a31c 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -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;
+ // }
}
}
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index cf40376..565d0a0 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -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,
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 79fb0a2..99583da 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -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');
diff --git a/resources/views/vendor/laravel-log-viewer/log.blade.php b/resources/views/vendor/laravel-log-viewer/log.blade.php
index aad56db..569a716 100644
--- a/resources/views/vendor/laravel-log-viewer/log.blade.php
+++ b/resources/views/vendor/laravel-log-viewer/log.blade.php
@@ -5,10 +5,7 @@
Laravel log viewer
-
+