Update dan Bugs Fix
This commit is contained in:
@@ -425,7 +425,10 @@ class RealisasiBelanjaController extends Controller
|
|||||||
try{
|
try{
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
$BelanjaRealisasiKontrak = BelanjaRealisasiKontrak::where("id",$id)->firstorNew();
|
$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();
|
BelanjaRealisasiKontrak::where("id",$id)->delete();
|
||||||
DB::commit();
|
DB::commit();
|
||||||
return redirect(URL::to("/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit"))
|
return redirect(URL::to("/realisasi-belanja/".$BelanjaRealisasiKontrak->belanja_realisasi_id."/submit"))
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ class RealisasiPendapatanController extends Controller
|
|||||||
// SEND NOTIF
|
// SEND NOTIF
|
||||||
$userBendahara = User::where("role_name","bendahara")->get()->toArray();
|
$userBendahara = User::where("role_name","bendahara")->get()->toArray();
|
||||||
$userBendahara = array_column($userBendahara,"id");
|
$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"];
|
$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);
|
$this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id);
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<div class="card-header border-0">
|
<div class="card-header border-0">
|
||||||
<h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2>
|
<h2 class="card-title"><i class="fa fa-search mr-2"></i> Filter Pencarian</h2>
|
||||||
<div class="card-tools">
|
<div class="card-tools">
|
||||||
<button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse">
|
<button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
|
||||||
<i class="fas fa-minus"></i>
|
<i class="fas fa-minus"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Jadwal Salur</h2>
|
<h2 class="card-title"><i class="fa fa-th-list mr-2"></i> Jadwal Salur</h2>
|
||||||
<div class="card-tools">
|
<div class="card-tools">
|
||||||
<button type="button" class="btn btn-secondary btn-sm" data-card-widget="collapse" title="Collapse">
|
<button type="button" class="btn btn-tool" data-card-widget="collapse" title="Collapse">
|
||||||
<i class="fas fa-minus"></i>
|
<i class="fas fa-minus"></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -456,6 +456,7 @@
|
|||||||
// dataSrc: ["kode_skpd"]
|
// dataSrc: ["kode_skpd"]
|
||||||
// },
|
// },
|
||||||
scrollX: true,
|
scrollX: true,
|
||||||
|
scrollY: "350px",
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -582,6 +582,7 @@
|
|||||||
// dataSrc: ["kode_skpd"]
|
// dataSrc: ["kode_skpd"]
|
||||||
// },
|
// },
|
||||||
scrollX: true,
|
scrollX: true,
|
||||||
|
scrollY: "350px",
|
||||||
});
|
});
|
||||||
|
|
||||||
optionDAK();
|
optionDAK();
|
||||||
|
|||||||
@@ -211,6 +211,7 @@
|
|||||||
"processing": "<div class='loading'></div>",
|
"processing": "<div class='loading'></div>",
|
||||||
},
|
},
|
||||||
scrollX:true,
|
scrollX:true,
|
||||||
|
scrollY: "350px",
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
extend: "collection",
|
extend: "collection",
|
||||||
|
|||||||
@@ -126,7 +126,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<?php if (strtoupper($BelanjaRealisasi->jenis_dana) == "DAK") { ?>
|
<?php if (strtoupper($BelanjaRealisasi->jenis_dana) == "DAK" && strtoupper($BelanjaRealisasi->sub_jenis_dana) == "FISIK") { ?>
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<strong><i class="fa fa-th-list mr-2"></i> KONTRAK</strong> <?= Auth::user()->can("Create Kontrak")?'[ <a class="modalButton" title="Input Kontrak" href="'.url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/kontrak') .'">Tambah Kontrak</a> ]':'' ?><hr style="margin-bottom: 0 !important;">
|
<strong><i class="fa fa-th-list mr-2"></i> KONTRAK</strong> <?= Auth::user()->can("Create Kontrak")?'[ <a class="modalButton" title="Input Kontrak" href="'.url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/kontrak') .'">Tambah Kontrak</a> ]':'' ?><hr style="margin-bottom: 0 !important;">
|
||||||
|
|||||||
@@ -197,6 +197,7 @@
|
|||||||
"processing": "<div class='loading'></div>",
|
"processing": "<div class='loading'></div>",
|
||||||
},
|
},
|
||||||
scrollX:true,
|
scrollX:true,
|
||||||
|
scrollY: "350px",
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
extend: "collection",
|
extend: "collection",
|
||||||
|
|||||||
@@ -85,38 +85,49 @@
|
|||||||
$("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}");
|
$("#txt_simtrad4_bersih").val("{{ separateNumberIndo($realisasi_pendapatan->simtrad4_bersih) }}");
|
||||||
showRinciDBH({{ $realisasi_pendapatan->id_sps }});
|
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){
|
$("#rkud_no_sts").on("keypress", function(e){
|
||||||
if (e.keyCode == 13){
|
if (e.keyCode == 13){
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if ($(this).val()==""){
|
getSTS();
|
||||||
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();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
$("#frmrealisasipendapatan").on("submit",function(e){
|
$("#frmrealisasipendapatan").on("submit",function(e){
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if ($("#rkud_jumlah").val()==$("#txt_simtrad4_bersih").val()){
|
if ($("#rkud_jumlah").val()==$("#txt_simtrad4_bersih").val()){
|
||||||
return e.currentTarget.submit();
|
if (getSTS()){
|
||||||
|
return e.currentTarget.submit();
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
Swal.fire("Jumlah pada STS harus sama dengan Rencana !", '', 'error');
|
Swal.fire("Jumlah pada STS harus sama dengan Rencana !", '', 'error');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user