From f5be223e53fe61c3771a50518d5d3bf00371233a Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Fri, 6 Aug 2021 09:28:23 +0800 Subject: [PATCH] server latest --- .../Controllers/AliranTunaiController.php | 8 +++---- app/Http/Controllers/KhazanahController.php | 10 ++++---- resources/views/aliran_tunai/index.blade.php | 2 ++ resources/views/khazanah/info.blade.php | 24 ++++++++++--------- resources/views/khazanah/serahan.blade.php | 7 ++++++ resources/views/lelongan/index.blade.php | 4 ++-- .../views/print/laporan_lejer_am.blade.php | 6 ++--- 7 files changed, 36 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 0459e14..15451aa 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -352,7 +352,7 @@ class AliranTunaiController extends Controller $lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json(); $lelongan = 0; - if(strtoupper($Auth::user()->name) === 'LELONG') + if(strtoupper(Auth::user()->name) === 'LELONG') { $lelongan = floatval($lelong); }else{ @@ -445,10 +445,10 @@ class AliranTunaiController extends Controller $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama); $gadaian = floatval($totalgadai); - if(strtoupper($Auth::user()->name) === 'LELONG'){ - $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki); + if(strtoupper(Auth::user()->name) === 'LELONG'){ + $bakisemasa = $lelongan; }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; diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 23c21a6..4c061b5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1394,9 +1394,9 @@ class KhazanahController extends Controller $amount = $request->amt; - if($amount>$baki_awal){ - return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); - }else{ +// if($amount>$baki_awal){ +// return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); +// }else{ $tarikh=$request->tarikh; $kodlaluan=$request->teller; @@ -1508,7 +1508,7 @@ class KhazanahController extends Controller } - } + // } $GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); $sumBaki=$GetLatestBakiTunai; @@ -2627,7 +2627,7 @@ class KhazanahController extends Controller //print lejer_AM public function cetak_lejer_am(Request $request) { - + $auth_user = Auth::user(); $api_url = config('api.url'); diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 021c54b..b1eb289 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -355,6 +355,8 @@ icon: 'warning', title: 'Peringatan', text: 'Aliran tunai selari dengan sistem!' + }).then(function() { + location.reload(); }); }else{ diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index bbcde99..800372d 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -721,7 +721,7 @@ 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(); if(histid == null){ Swal.fire({ @@ -772,17 +772,19 @@ title: 'Amaran', text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' }); + } + - }else if($("input[name='options']:checked").val() == 'lelong'){ - let histid = $('input[name="sudahtebus"]:checked').val(); - - Swal.fire({ - icon: 'error', - title: 'Amaran', - text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' - }); - - } +// }else if($("input[name='options']:checked").val() == 'lelong'){ +// let histid = $('input[name="sudahtebus"]:checked').val(); +// +// Swal.fire({ +// icon: 'error', +// title: 'Amaran', +// text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' +// }); +// +// } } diff --git a/resources/views/khazanah/serahan.blade.php b/resources/views/khazanah/serahan.blade.php index 45c6d4d..e0bb0a1 100644 --- a/resources/views/khazanah/serahan.blade.php +++ b/resources/views/khazanah/serahan.blade.php @@ -15,6 +15,13 @@
+ + @if(session()->has('message')) +
+ {{ session()->get('message') }} +
+ @endif +
diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index b32ad3f..98716d3 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -260,7 +260,7 @@ buttonsStyling: false }); - let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); + //let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val(); swalWithBootstrapButtons.fire({ title: 'Dapatkan Pengesahan Khazanah', @@ -327,7 +327,7 @@ encrypted: true }); - let teller = "{{ Auth::user()->name }}"; + //let teller = "{{ Auth::user()->name }}"; var channel = pusher.subscribe('notice-ubahhapus'); channel.bind('my-ubahhapus', function(data) { diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 10e7ab8..451057d 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -354,7 +354,7 @@ @endforeach @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') {{ $deb['glcode'] }} {{ $deb['descpt'] }} @@ -366,7 +366,7 @@ @endforeach @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') {{ $kred['glcode'] }} {{ $kred['descpt'] }} @@ -429,4 +429,4 @@ - \ No newline at end of file +