diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index c9b07aa..712fb14 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -301,7 +301,7 @@ class RealisasiBelanjaController extends Controller if (!empty($SubJenisDana)){ // CHT - $filter.= " AND x.SUB_JENIS_DANA = 2"; + $filter.= " AND x.SUB_JENIS_DANA = ".$SubJenisDana; } if (!empty($subkeg)){ diff --git a/resources/views/realisasi_belanja/create.blade.php b/resources/views/realisasi_belanja/create.blade.php index ba97951..2d2af5f 100644 --- a/resources/views/realisasi_belanja/create.blade.php +++ b/resources/views/realisasi_belanja/create.blade.php @@ -33,7 +33,7 @@ @csrf @include('realisasi_belanja.form') - Ubah Rsk + UBAH RSK diff --git a/resources/views/realisasi_belanja/edit.blade.php b/resources/views/realisasi_belanja/edit.blade.php index 49b535f..f0ad5d7 100644 --- a/resources/views/realisasi_belanja/edit.blade.php +++ b/resources/views/realisasi_belanja/edit.blade.php @@ -84,9 +84,9 @@ $("select[name=unit]").val("{{ $realisasi_belanja->unit_satuan }}"); $("input[name=jml_rencana_kontrak]").val("{{ isset($realisasi_belanja->jml_rencana_kontrak)?$realisasi_belanja->jml_rencana_kontrak:0 }}"); - subJenisDana($("#jenis_dana").val()); + // subJenisDana($("#jenis_dana").val()); subJenisBelanja($("select[name=jenis]").val()); - + $(document).on("submit","#frmRealBelanja",function (e){ e.preventDefault(); Swal.fire({ diff --git a/resources/views/realisasi_belanja/index.blade.php b/resources/views/realisasi_belanja/index.blade.php index 2f41447..dd30592 100644 --- a/resources/views/realisasi_belanja/index.blade.php +++ b/resources/views/realisasi_belanja/index.blade.php @@ -130,7 +130,7 @@ }); subJenisDana($("#srcJenisDana").val()); - $("#srcSubJenisDana, #srcTA, #id_sps").on("change",function(){ + $("#srcJenisDana, #srcSubJenisDana, #srcTA, #id_sps").on("change",function(){ dtTable.draw(); }); diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index 44260a4..2c3acfb 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -171,7 +171,7 @@ - jenis_dana) == "DAK" && strtoupper($BelanjaRealisasi->sub_jenis_dana) == "FISIK") { ?> + jenis_dana) == "DAK" && strtoupper($BelanjaRealisasi->nama_jenis_dana) == "FISIK") { ?>

KONTRAK can("Create Kontrak")?'[ Tambah Kontrak ]':'' ?>