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

fix

Browse Source
This commit is contained in:
afiq
2021-08-06 09:36:29 +08:00
parent ecaa6a7357 f5be223e53
commit 78841016d8
7 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+4 -4
View File
@@ -352,7 +352,7 @@ class AliranTunaiController extends Controller
$lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json(); $lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json();
$lelongan = 0; $lelongan = 0;
if(strtoupper($Auth::user()->name) === 'LELONG') if(strtoupper(Auth::user()->name) === 'LELONG')
{ {
$lelongan = floatval($lelong); $lelongan = floatval($lelong);
}else{ }else{
@@ -445,10 +445,10 @@ class AliranTunaiController extends Controller
$penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
$gadaian = floatval($totalgadai); $gadaian = floatval($totalgadai);
if(strtoupper($Auth::user()->name) === 'LELONG'){ if(strtoupper(Auth::user()->name) === 'LELONG'){
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); $bakisemasa = $lelongan;
}else{ }else{
$bakisemasa = $lelongan; $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
} }
$errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false; $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
app/Http/Controllers/KhazanahController.php
+5 -5
View File
@@ -1441,9 +1441,9 @@ class KhazanahController extends Controller
$amount = $request->amt; $amount = $request->amt;
if($amount>$baki_awal){ // if($amount>$baki_awal){
return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); // return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
}else{ // }else{
$tarikh=$request->tarikh; $tarikh=$request->tarikh;
$kodlaluan=$request->teller; $kodlaluan=$request->teller;
@@ -1555,7 +1555,7 @@ class KhazanahController extends Controller
} }
} // }
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$sumBaki=$GetLatestBakiTunai; $sumBaki=$GetLatestBakiTunai;
@@ -2735,7 +2735,7 @@ class KhazanahController extends Controller
//print lejer_AM //print lejer_AM
public function cetak_lejer_am(Request $request) public function cetak_lejer_am(Request $request)
{ {
$auth_user = Auth::user(); $auth_user = Auth::user();
$api_url = config('api.url'); $api_url = config('api.url');
resources/views/aliran_tunai/index.blade.php
+2
View File
@@ -355,6 +355,8 @@
icon: 'warning', icon: 'warning',
title: 'Peringatan', title: 'Peringatan',
text: 'Aliran tunai selari dengan sistem!' text: 'Aliran tunai selari dengan sistem!'
}).then(function() {
location.reload();
}); });
}else{ }else{
resources/views/khazanah/info.blade.php
+13 -11
View File
@@ -724,7 +724,7 @@
function saghilangfunc() function saghilangfunc()
{ {
if($("input[name='options']:checked").val() == 'belum_tebus'){ if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
let histid = $('input[name="belum"]:checked').val(); let histid = $('input[name="belum"]:checked').val();
if(histid == null){ if(histid == null){
Swal.fire({ Swal.fire({
@@ -775,17 +775,19 @@
title: 'Amaran', title: 'Amaran',
text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
}); });
}
}else if($("input[name='options']:checked").val() == 'lelong'){ // }else if($("input[name='options']:checked").val() == 'lelong'){
let histid = $('input[name="sudahtebus"]:checked').val(); // let histid = $('input[name="sudahtebus"]:checked').val();
//
Swal.fire({ // Swal.fire({
icon: 'error', // icon: 'error',
title: 'Amaran', // title: 'Amaran',
text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' // text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
}); // });
//
} // }
} }
resources/views/khazanah/serahan.blade.php
+7
View File
@@ -15,6 +15,13 @@
</nav> </nav>
<div class="card-body text-center"> <div class="card-body text-center">
@if(session()->has('message'))
<div class="alert alert-danger">
{{ session()->get('message') }}
</div>
@endif
<div class="row mb-4"> <div class="row mb-4">
<div class="col-2 justify-content-start"> <div class="col-2 justify-content-start">
resources/views/lelongan/index.blade.php
+2 -2
View File
@@ -260,7 +260,7 @@
buttonsStyling: false buttonsStyling: false
}); });
let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); //let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
swalWithBootstrapButtons.fire({ swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah', title: 'Dapatkan Pengesahan Khazanah',
@@ -329,7 +329,7 @@
encrypted: true encrypted: true
}); });
let teller = "{{ Auth::user()->name }}"; //let teller = "{{ Auth::user()->name }}";
var channel = pusher.subscribe('notice-ubahhapus'); var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) { channel.bind('my-ubahhapus', function(data) {
resources/views/print/laporan_lejer_am.blade.php
+2 -2
View File
@@ -483,7 +483,7 @@
@endforeach @endforeach
@foreach($Debit as $index=>$deb) @foreach($Debit as $index=>$deb)
@if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019') @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019' || $deb['glcode'] == '3000/020')
<tr> <tr>
<td style="width:10px">{{ $deb['glcode'] }}</td> <td style="width:10px">{{ $deb['glcode'] }}</td>
<td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td> <td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
@@ -495,7 +495,7 @@
@endforeach @endforeach
@foreach($Kredit as $index=>$kred) @foreach($Kredit as $index=>$kred)
@if($kred['glcode'] == '5000/241' || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102') @if($kred['glcode'] == '5000/241' || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102' || $kred['glcode'] == '7000/090')
<tr> <tr>
<td style="width:10px">{{ $kred['glcode'] }}</td> <td style="width:10px">{{ $kred['glcode'] }}</td>
<td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td> <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>