diff --git a/README.md b/README.md index 6b16eb7..49c38be 100644 --- a/README.md +++ b/README.md @@ -62,4 +62,3 @@ If you discover a security vulnerability within Laravel, please send an e-mail t ## License The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). ->>>>>>> 149fecc55468d8a3bdcff628c2c339b19436829b diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php index f8ef4e7..e7f2470 100644 --- a/app/Http/Controllers/ItemSearchController.php +++ b/app/Http/Controllers/ItemSearchController.php @@ -141,12 +141,12 @@ class ItemSearchController extends Controller $jenis = $request->jenis; if (getRole()=="skpd"){ - $sps = DB::select(DB::raw("SELECT x.ID_REKENING as ID,x.KODE_REKENING||' | '||z.NAMA_REKENING as name + $sps = DB::select(DB::raw("SELECT x.KODE_REKENING as IDX,x.KODE_REKENING||' | '||z.NAMA_REKENING as name FROM SAMASA.MAPPING_DBH_SKPD x LEFT JOIN SAMASA.VW_REKENING_PENDAPATAN z ON x.ID_REKENING = z.ID WHERE x.kode_skpd='".Auth::user()->nrk."'")); }else{ - $select = DB::raw("ID,KODE_REKENING||' | '||NAMA_REKENING as name"); + $select = DB::raw("KODE_REKENING AS IDX,KODE_REKENING||' | '||NAMA_REKENING as name"); $sps = VwRekeningPendapatan::select($select); if (!empty($search)){ diff --git a/app/Http/Controllers/JadwalSalurdanaController.php b/app/Http/Controllers/JadwalSalurdanaController.php index 160881e..f276b50 100644 --- a/app/Http/Controllers/JadwalSalurdanaController.php +++ b/app/Http/Controllers/JadwalSalurdanaController.php @@ -38,7 +38,7 @@ class JadwalSalurdanaController extends Controller $sqlstr = Sps_pendapatan::queryJadwalSalurDana($ta); if (!empty($idSPS)){ - $sqlstr.=" AND x.ID=$idSPS"; + $sqlstr.=" AND x.KODE_REKENING='$idSPS'"; } $dataTotal = count(DB::select(DB::raw($sqlstr))); @@ -75,7 +75,7 @@ class JadwalSalurdanaController extends Controller { if ($request->id_sps > 0) { - $filter.=" AND x.id_sps=".$request->id_sps; + $filter.=" AND x.kode_rekening='".$request->id_sps."'"; $idSPS = $request->id_sps; } } diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index afefa34..058914d 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -20,6 +20,7 @@ use App\Models\VwDpaRsk; use App\Models\VwBelanjaRealisasi; use App\Models\UnitSatuan; use App\Models\Sp2d; +use App\Models\Trbas; use App\Models\Sps_pendapatan; use App\Imports\RealisasiBelanjaImport; use App\Imports\RealisasiBelanjaImportDak; @@ -126,16 +127,17 @@ class RealisasiBelanjaController extends Controller "jml_rencana_kontrak"=>isset($req["jml_rencana_kontrak"])?$req["jml_rencana_kontrak"]:0, "jenis_dana"=>$req["jenis_dana"], "sub_jenis_dana"=>$req["sub_jenis_dana"], - "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0, + // "id_sps"=>isset($req["id_sps"])?$req["id_sps"]:0, "created_by"=>Auth::user()->id ]; if (isset($req["id_sps"])) { - $sps = Sps_pendapatan::where("ID", $req["id_sps"])->firstorNew(); + $sps = Trbas::where("C_AKUN", $req["id_sps"])->firstorNew(); + if ($sps){ - $input["kode_rekening"] = $sps["kode_rekening"]; - $input["nama_rekening"] = $sps["nama_rekening"]; + $input["kode_rekening"] = $sps["c_akun"]; + $input["nama_rekening"] = $sps["n_akun"]; } } @@ -325,7 +327,7 @@ class RealisasiBelanjaController extends Controller } if (!empty($idSPS)){ - $filter.= " AND id_sps = ".$idSPS; + $filter.= " AND KODE_REKENING = '".$idSPS."'"; } if (!empty($fReview)){ diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index 1a7c44f..12ea655 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Facades\Excel; use App\Models\PendapatanRealisasi; use App\Models\Sps_pendapatan; +use App\Models\VwJadwalSalur; use App\Models\User; use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Writer\Xlsx; @@ -41,7 +42,7 @@ class RealisasiPendapatanController extends Controller protected function dataPendapatan($req= []) { $data["tahun"] = $req["txt_ta"]; - $data["id_sps"] = $req["txt_id_sps"]; + // $data["id_sps"] = $req["txt_id_sps"]; $txt_rek_sps = explode("|",$req["txt_rek_sps"]); $data["kode_rekening_sps"] = $txt_rek_sps[0]; $data["nama_rekening_sps"] = $txt_rek_sps[1]; @@ -66,7 +67,7 @@ class RealisasiPendapatanController extends Controller $req = $request->all(); $data = $this->dataPendapatan($req); $data["created_by"] = Auth::user()->id; - + // var_dump($data); exit; $PendapatanRealisasi = PendapatanRealisasi::create($data); // SEND NOTIF @@ -115,7 +116,7 @@ class RealisasiPendapatanController extends Controller { $idSPS = $request->idSPS; $select = DB::raw("spsbulan1,spsbulan2,spsbulan3,spsbulan4,spsbulan5,spsbulan6,spsbulan7,spsbulan8,spsbulan9,spsbulan10,spsbulan11,spsbulan12"); - $sps = Sps_pendapatan::select($select)->where("ID",$idSPS)->firstOrNew(); + $sps = VwJadwalSalur::select($select)->where("TAHUN",getTA())->where("KODE_REKENING",$idSPS)->firstOrNew(); return response()->json($sps); } @@ -133,7 +134,7 @@ class RealisasiPendapatanController extends Controller $data = PendapatanRealisasi::where("tahun",$ta)->orderBy("created_at","ASC"); if (!empty($sps)) { - $data->where("id_sps",$sps); + $data->where("kode_rekening_sps",$sps); } if (!empty($src)) diff --git a/app/Models/BelanjaRealisasi.php b/app/Models/BelanjaRealisasi.php index 5c3e5ef..63c4265 100644 --- a/app/Models/BelanjaRealisasi.php +++ b/app/Models/BelanjaRealisasi.php @@ -73,8 +73,8 @@ class BelanjaRealisasi extends Eloquent THEN NVL(d.jml_spd, 0) ELSE NVL(c.jml_spd, 0) END AS jml_spd FROM VW_BELANJA_REALISASI a LEFT JOIN ( - SELECT I_IDRSK,SUM(REALISASI_1) AS jml - FROM MV_REALISASI_BELANJA_PERBULAN + SELECT I_IDRSK,SUM(REALISASI) AS jml + FROM MV_ANGGARAN_REALISASI_RSK WHERE C_ANGG_TAHUN = $ta GROUP BY I_IDRSK ) b ON a.kode_rsk = b.I_IDRSK diff --git a/app/Models/Sps_pendapatan.php b/app/Models/Sps_pendapatan.php index 8fbf3f5..ec058b0 100644 --- a/app/Models/Sps_pendapatan.php +++ b/app/Models/Sps_pendapatan.php @@ -18,7 +18,7 @@ class Sps_pendapatan extends Eloquent $sqlstr = 'SELECT * FROM VW_JADWAL_SALUR x '; if (getRole()=="skpd"){ - $sqlstr .= ' WHERE x.id IN (SELECT id_sps FROM SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD=\''.Auth::user()->nrk.'\') '; + $sqlstr .= ' WHERE x.kode_rekening IN (SELECT kode_rekening FROM SAMASA.MAPPING_DBH_SKPD WHERE KODE_SKPD=\''.Auth::user()->nrk.'\') '; }else{ $sqlstr .= " WHERE 1=1 "; } diff --git a/app/Models/VwJadwalSalur.php b/app/Models/VwJadwalSalur.php new file mode 100644 index 0000000..38d844a --- /dev/null +++ b/app/Models/VwJadwalSalur.php @@ -0,0 +1,14 @@ +',{value:"",text:""})); $.map(data, function (item) { $('#txt_id_sps').append($('").val("{{ $realisasi_belanja->id_sps }}").text("{{ $sps->name }}") - $("select[name=id_sps]").val("{{ $realisasi_belanja->id_sps }}"); - $("select[name=id_sps]").append($newOptionSps).trigger('change'); + kode_rekening)) { ?> + let $newOptionSps = $("").val("{{ $realisasi_belanja->kode_rekening }}").text("{{ $realisasi_belanja->nama_rekening }}") + $("select[name=id_sps]").val("{{ $realisasi_belanja->kode_rekening }}"); + $("select[name=id_sps]").append($newOptionSps).trigger('change'); let $newOptionJenisBelanja = $("").val("{{ $realisasi_belanja->jenis_belanja }}").text("{{ $realisasi_belanja->nama_jenis_belanja }}") diff --git a/resources/views/realisasi_belanja/submit.blade.php b/resources/views/realisasi_belanja/submit.blade.php index d078f13..033f30d 100644 --- a/resources/views/realisasi_belanja/submit.blade.php +++ b/resources/views/realisasi_belanja/submit.blade.php @@ -70,9 +70,9 @@ cekInputKontrak("{{ $BelanjaRealisasi->nama_subjenis_dana }}"); - id_sps)) { ?> - let $newOptionSps = $("").val("{{ $BelanjaRealisasi->id_sps }}").text("{{ $sps->name }}") - $("select[name=id_sps]").val("{{ $BelanjaRealisasi->id_sps }}"); + kode_rekening)) { ?> + let $newOptionSps = $("").val("{{ $BelanjaRealisasi->kode_rekening }}").text("{{ $BelanjaRealisasi->nama_rekening }}") + $("select[name=id_sps]").val("{{ $BelanjaRealisasi->kode_rekening }}"); $("select[name=id_sps]").append($newOptionSps).trigger('change'); $("select[name=id_sps]").attr("disabled", true); diff --git a/resources/views/realisasi_pendapatan/form.blade.php b/resources/views/realisasi_pendapatan/form.blade.php index 1ec3269..afb5ffc 100644 --- a/resources/views/realisasi_pendapatan/form.blade.php +++ b/resources/views/realisasi_pendapatan/form.blade.php @@ -171,7 +171,7 @@ results: $.map(data, function (item) { return { text: item.name, - id: item.id + id: item.idx } }) }; diff --git a/resources/views/realisasi_pendapatan/index.blade.php b/resources/views/realisasi_pendapatan/index.blade.php index 38f1f0e..e841d18 100644 --- a/resources/views/realisasi_pendapatan/index.blade.php +++ b/resources/views/realisasi_pendapatan/index.blade.php @@ -105,7 +105,7 @@ results: $.map(data, function (item) { return { text: item.name, - id: item.id + id: item.idx } }) };