gitea/sidata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Git Fix Conflict

Browse Source
This commit is contained in:
izuddin
2026-06-19 14:48:06 +07:00
parent 5bbf6008ed cae2b02010
commit b6dd0b04bc
6 changed files with 163 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RealisasiPendapatanController.php
+1
View File
@@ -58,6 +58,7 @@ class RealisasiPendapatanController extends Controller
$data["tw"] = $req["tw"];
$data["gelombang"] = $req["gelombang"];
$data["bulan"] = $req["bulan"];
$data["potongan_pph"] = replaceMoney($req["potongan_pph"]);
$data["potongan_jkn"] = replaceMoney($req["potongan_jkn"]);
app/Models/PendapatanRealisasi.php
+1 -1
View File
@@ -15,7 +15,7 @@ class PendapatanRealisasi extends Eloquent
protected $fillable = [
'tahun','simtrad4_uraian','simtrad4_kotor','simtrad4_potongan','simtrad4_bersih','simtrad4_tgl_sp2d_bun','simtrad4_sp2d_bun',
'rkud_tgl','rkud_no_sts','rkud_kode_akun','rkud_nama_akun','rkud_jumlah','id_sps','kode_rekening_sps','nama_rekening_sps','file_sts',
'retur','bersih','tw','gelombang','potongan_pph','potongan_jkn'
'retur','bersih','tw','gelombang','potongan_pph','potongan_jkn','bulan'
];
public function hasSts() {
resources/views/partials/menu.blade.php
+72 -23
View File
@@ -8,13 +8,33 @@
<span class="brand-text font-weight" style="line-height:1; letter-spacing:3px; font-weight:bold;">S I D A T A</span>
</a>
<div class="sidebar">
<nav class="mt-2">
<ul class="nav nav-pills nav-sidebar flex-column nav-flat" data-widget="treeview" role="menu" data-accordion="false">
<div class="sidebar" style="width: 300px !important;">
<nav class="mt-3">
<ul class="nav nav-pills nav-sidebar flex-column nav-flat" data-widget="treeview" role="menu"
data-accordion="false">
<li class="nav-header">MENU UTAMA</li>
<li class="nav-item"><a href="{{ $baseUrl }}/home" class="nav-link" ><i class="nav-icon fas fa-home"></i><p>Beranda</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/notif" class="nav-link" ><i class="nav-icon far fa-bell"></i><p>Notifikasi</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/jadwal-salurdana" class="nav-link"><i class="nav-icon fa fa-calendar-alt"></i><p>Jadwal Salur Dana</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/home" class="nav-link"><i class="nav-icon fas fa-home"></i>
<p>Beranda</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/notif" class="nav-link"><i class="nav-icon far fa-bell"></i>
<p>Notifikasi</p>
</a></li>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon fas fa-wallet"></i>
<p>
Pendapatan
<i class="right fas fa-angle-left"></i>
</p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ $baseUrl }}/jadwal-salurdana" class="nav-link"><i class="nav-icon fa fa-calendar-alt"></i>
<p>Jadwal Salur Dana</p>
</a>
</li>
<!-- </li> -->
<?php /* <li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon fa fa-calendar-alt"></i>
@@ -84,6 +104,16 @@
</a>
</li>
<?php } ?>
<?php if ($role == "anggaran"){ ?>
<li class="nav-item">
<a href="{{ $baseUrl }}/SisaSalurDana" class="nav-link">
<i class="fas fa-grip-lines nav-icon"></i>
<p style="font-size: 0.80rem;">Sisa Tahun Anggaran Sebelumnya</p>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php if (Auth::user()->can("Read DBH Realisasi Belanja") || $role == "superadmin"){ ?>
<li class="nav-item">
<a href="{{ $baseUrl }}/realisasi-belanja" class="nav-link">
@@ -91,14 +121,6 @@
<p>Belanja</p>
</a>
</li>
<?php } ?>
<?php if ($role == "anggaran"){ ?>
<li class="nav-item">
<a href="{{ $baseUrl }}/SisaSalurDana" class="nav-link">
<i class="fas fa-grip-lines nav-icon"></i>
<p>Sisa Tahun Anggaran Sebelumnya</p>
</a>
</li>
<?php } ?>
<li class="nav-item">
<a href="{{ $baseUrl }}/laporan-file" class="nav-link">
@@ -116,19 +138,46 @@
<?php } ?>
@if ($role == "admin" || $role == "superadmin")
<li class="nav-header">MASTER DATA</li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/users" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Pengguna</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstDauRinci" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>DAU Rinci</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MappingDbhSkpd" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Mapping Rek DBH/DAK</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstJenisBelanja" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Jenis Belanja</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstJenisDana" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Jenis Dana</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/users" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Pengguna</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstDauRinci" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>DAU Rinci</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MappingDbhSkpd" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Mapping Rek DBH/DAK</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstJenisBelanja" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Jenis Belanja</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstJenisDana" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Jenis Dana</p>
</a></li>
<!-- <li class="nav-item"><a href="{{ $baseUrl }}/admin/SisaSalurDana" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Sisa Salur Dana</p></a></li> -->
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstSatuan" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Satuan</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/Pengaturan" class="nav-link"><i class="nav-icon fas fa-cogs nav-icon"></i><p>Pengaturan</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/MstSatuan" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Satuan</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/Pengaturan" class="nav-link"><i
class="nav-icon fas fa-cogs nav-icon"></i>
<p>Pengaturan</p>
</a></li>
@endif
@if ($role == "superadmin")
<li class="nav-header">PENGATURAN</li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/permissions" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Permissions</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/roless" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Roles</p></a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/permissions" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Permissions</p>
</a></li>
<li class="nav-item"><a href="{{ $baseUrl }}/admin/roless" class="nav-link"><i
class="nav-icon fas fa-th-large nav-icon"></i>
<p>Roles</p>
</a></li>
@endif
</ul>
</nav>
resources/views/partials/top_menu.blade.php
+1
View File
@@ -9,6 +9,7 @@
</li>
<li class="nav-item d-none d-sm-inline-block">
{{-- <a href="{{ $baseUrl }}/AdminLTE-3.2.0/index3.html" class="nav-link">Home</a> --}}
<a class="nav-link fa-1x pl-0"><strong>TAHUN ANGGARAN {{ !empty(Session::get('Tahun_Anggaran')) ? Session::get('Tahun_Anggaran') : date("Y") }}</strong></a>
</li>
</ul>
resources/views/realisasi_belanja/index.blade.php
+1 -1
View File
@@ -109,7 +109,7 @@
"SKPD",
"Program",
"Sub Kegiatan",
"RSK",
"Aktivitas",
"Rekening",
"Anggaran",
"Volume",
resources/views/realisasi_pendapatan/form.blade.php
+18 -2
View File
@@ -113,14 +113,30 @@
<div id="tamsil_tpg" class="row">
<div class="col-6">
<div class="form-group">
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">TW</label>
<select id="tw" name="tw" class="form-control">
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun" style="display: none">TW</label>
<select id="tw" name="tw" class="form-control" style="display: none">
<option value="">Pilih TW</option>
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
<option value="4">4</option>
</select>
<label class="col-form-label label-align" for="txt_simtrad4_sp2d_bun">Bulan</label>
<select id="bulan" name="bulan" class="form-control">
<option value="">Pilih Bulan</option>
<option value="1">Januari</option>
<option value="2">Februari</option>
<option value="3">Maret</option>
<option value="4">April</option>
<option value="5">Mei</option>
<option value="6">Juni</option>
<option value="7">Juli</option>
<option value="8">Agustus</option>
<option value="9">September</option>
<option value="10">Oktober</option>
<option value="11">November</option>
<option value="12">Desember</option>
</select>
</div>
</div>
<div class="col-6">