diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 6b061f1..173da10 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -425,7 +425,10 @@ class RealisasiBelanjaController extends Controller try{ DB::beginTransaction(); $BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("id",$id)->firstorNew(); - unlink("uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak); + $alamatFile = "uploadFiles/kontrak/".$BelanjaRealisasiKontrak->file_kontrak; + if (file_exists($alamatFile)){ + unlink($alamatFile); + } BelanjaRealisasiKontrak::where("id",$id)->delete(); DB::commit(); return redirect(URL::to("/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit")) diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index 27f85f3..bc6c872 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -68,7 +68,7 @@ class RealisasiPendapatanController extends Controller // SEND NOTIF $userBendahara = User::where("role_name","bendahara")->get()->toArray(); $userBendahara = array_column($userBendahara,"id"); - $url = "/realisasi-pendapatan/".$PendapatanRealisasi->id; + $url = URL::to("/realisasi-pendapatan/".$PendapatanRealisasi->id); $message = "Realisasi Pendapatan telah dibuat oleh Bidang Anggaran dengan No. SP2D BUN ".$req["txt_simtrad4_sp2d_bun"]; $this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id); diff --git a/resources/views/jadwal_salurdana/index_cht.blade.php b/resources/views/jadwal_salurdana/index_cht.blade.php index d619b48..96c1ab3 100644 --- a/resources/views/jadwal_salurdana/index_cht.blade.php +++ b/resources/views/jadwal_salurdana/index_cht.blade.php @@ -19,7 +19,7 @@

Filter Pencarian

-
@@ -42,7 +42,7 @@

Jadwal Salur

-
@@ -456,6 +456,7 @@ // dataSrc: ["kode_skpd"] // }, scrollX: true, + scrollY: "350px", }); }); diff --git a/resources/views/jadwal_salurdana/index_dak.blade.php b/resources/views/jadwal_salurdana/index_dak.blade.php index 8dace82..998ce56 100644 --- a/resources/views/jadwal_salurdana/index_dak.blade.php +++ b/resources/views/jadwal_salurdana/index_dak.blade.php @@ -582,6 +582,7 @@ // dataSrc: ["kode_skpd"] // }, scrollX: true, + scrollY: "350px", }); optionDAK(); diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 09c19f4..b1317fd 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -211,6 +211,7 @@ "processing": "
", }, scrollX:true, + scrollY: "350px", buttons: [ { extend: "collection", diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index 6f33f14..7a84614 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -126,7 +126,7 @@
- jenis_dana) == "DAK") { ?> + jenis_dana) == "DAK" && strtoupper($BelanjaRealisasi->sub_jenis_dana) == "FISIK") { ?>
KONTRAK can("Create Kontrak")?'[ Tambah Kontrak ]':'' ?>
diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index eaf46ea..d7f6e0d 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -197,6 +197,7 @@ "processing": "
", }, scrollX:true, + scrollY: "350px", buttons: [ { extend: "collection", diff --git a/resources/views/realisasi_pendapatan/show.blade.php b/resources/views/realisasi_pendapatan/show.blade.php index 6c7e089..ee57abf 100644 --- a/resources/views/realisasi_pendapatan/show.blade.php +++ b/resources/views/realisasi_pendapatan/show.blade.php @@ -85,38 +85,49 @@ $("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}"); showRinciDBH({{ $realisasi_pendapatan->id_sps }}); + getSTS = () =>{ + if ($("#rkud_no_sts").val()==""){ + Swal.fire("Harap isi nomor STS!", '', 'error'); + return false; + }else{ + $(".loading").show(); + let stat = false; + $.ajax({ + url: '{{ $baseUrl }}/item-search-sts?no_skprd='+$("#rkud_no_sts").val(), + dataType: 'json', + async: false, + success: function (data) { + if (Object.keys(data).length == 0){ + Swal.fire("Data STS tidak ditemukan !", '', 'error'); + }else{ + $("#rkud_tgl").val(data.tgl_validasi); + $("#rkud_kode_akun").val(data.kode_bas); + $("#rkud_nama_akun").val(data.n_akun); + $("#rkud_jumlah").val(data.nilai_bayar); + } + stat = true; + }, + complete: function(){ + $('.loading').hide(); + } + }); + return stat; + } + } + $("#rkud_no_sts").on("keypress", function(e){ if (e.keyCode == 13){ e.preventDefault(); - if ($(this).val()==""){ - Swal.fire("Harap isi nomor STS!", '', 'error'); - }else{ - $(".loading").show(); - $.ajax({ - url: '{{ $baseUrl }}/item-search-sts?no_skprd='+$(this).val(), - dataType: 'json', - success: function (data) { - if (Object.keys(data).length == 0){ - Swal.fire("Data STS tidak ditemukan !", '', 'error'); - }else{ - $("#rkud_tgl").val(data.tgl_validasi); - $("#rkud_kode_akun").val(data.kode_bas); - $("#rkud_nama_akun").val(data.n_akun); - $("#rkud_jumlah").val(data.nilai_bayar); - } - }, - complete: function(){ - $('.loading').hide(); - } - }); - } + getSTS(); } }); $("#frmrealisasipendapatan").on("submit",function(e){ e.preventDefault(); if ($("#rkud_jumlah").val()==$("#txt_simtrad4_bersih").val()){ - return e.currentTarget.submit(); + if (getSTS()){ + return e.currentTarget.submit(); + } }else{ Swal.fire("Jumlah pada STS harus sama dengan Rencana !", '', 'error'); }