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
app/Http/Controllers/AliranTunaiController.php
+1 -1
View File
@@ -1098,7 +1098,7 @@ class AliranTunaiController extends Controller
} }
else 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; $jumlahBulan_ini_Upah=$jumlah_Upah-$jumlahBulan_ini_Upah;
}//end bulan tahun }//end bulan tahun
$Jumlah_TahunIni_Upah=0.0; $Jumlah_TahunIni_Upah=0.0;
app/Http/Controllers/KhazanahController.php
-2
View File
@@ -4088,7 +4088,6 @@ class KhazanahController extends Controller
if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); 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]); if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
$totalhartasemasa = 0; $totalhartasemasa = 0;
foreach($hartasemasa as $index => $hs) foreach($hartasemasa as $index => $hs)
{ {
@@ -4120,7 +4119,6 @@ class KhazanahController extends Controller
if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); 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; $totaltanggungansemasa = 0;
foreach($tanggungansemasa as $index => $ts) foreach($tanggungansemasa as $index => $ts)
{ {
resources/views/aliran_tunai/index.blade.php
+1 -1
View File
@@ -256,7 +256,7 @@
<td> {{ $loop->iteration }} </td> <td> {{ $loop->iteration }} </td>
<td> {{ $ansur['tarikh'] }} </td> <td> {{ $ansur['tarikh'] }} </td>
<td> {{ $ansur['norujukan'] }} </td> <td> {{ $ansur['norujukan'] }} </td>
<td> {{ number_format($ansur['upahdibayar'],2) }} </td> <td> {{ number_format($ansur['upahDibayar'],2) }} </td>
</tr> </tr>
@endforeach @endforeach
@endif @endif
resources/views/customers/index.blade.php
+27 -27
View File
@@ -827,33 +827,33 @@
return false; return false;
} }
}else if(id_type=='passport'){ }else if(id_type=='passport'){
if(nokp.length < 5){ // if(nokp.length < 5){
Swal.fire({ // Swal.fire({
icon: 'error', // icon: 'error',
title: 'Amaran!', // title: 'Amaran!',
text: 'Sila Periksa Passport Pelanggan' // text: 'Sila Periksa Passport Pelanggan'
}); // });
event.preventDefault(); // event.preventDefault();
return false; // return false;
} // }
if(nokp.indexOf(' ') > 0){ // if(nokp.indexOf(' ') > 0){
Swal.fire({ // Swal.fire({
icon: 'error', // icon: 'error',
title: 'Amaran!', // title: 'Amaran!',
text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)' // text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)'
}); // });
event.preventDefault(); // event.preventDefault();
return false; // return false;
} // }
if(regex.test(nokp) == false){ // if(regex.test(nokp) == false){
Swal.fire({ // Swal.fire({
icon: 'error', // icon: 'error',
title: 'Amaran!', // title: 'Amaran!',
text: 'Sila Periksa Passport Pelanggan' // text: 'Sila Periksa Passport Pelanggan'
}); // });
event.preventDefault(); // event.preventDefault();
return false; // return false;
} // }
} }
} }
</script> </script>
resources/views/layouts/app_operasi.blade.php
-2
View File
@@ -141,12 +141,10 @@
audio.onended = function() { audio.onended = function() {
if(countlagu <= 3){ if(countlagu <= 3){
countlagu++; countlagu++;
console.log(countlagu);
this.play(); this.play();
} }
} }
} }
const Toast = Swal.mixin({ const Toast = Swal.mixin({
toast: true, toast: true,
position: 'top-end', position: 'top-end',
resources/views/operasi/kelulusan.blade.php
-3
View File
@@ -160,7 +160,6 @@
}); });
var audio = new Audio("{{ asset('sound/3.wav') }}"); var audio = new Audio("{{ asset('sound/3.wav') }}");
// audio.muted = true;
if(tablekelulusan.data().any()){ if(tablekelulusan.data().any()){
audio.play(); audio.play();
@@ -168,8 +167,6 @@
this.currentTime = 0; this.currentTime = 0;
this.play(); this.play();
}, false); }, false);
console.log('betul');
}else{ }else{
audio.loop = false; audio.loop = false;
audio.muted = true; audio.muted = true;
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" <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<!-- FontAwesome --> <!-- FontAwesome -->
<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script> <script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
<!-- Datatables --> <!-- Datatables -->