diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php index 84f4131..f5389f7 100644 --- a/app/Http/Controllers/RealisasiBelanjaController.php +++ b/app/Http/Controllers/RealisasiBelanjaController.php @@ -79,7 +79,7 @@ class RealisasiBelanjaController extends Controller FROM NEWSIPKD.TMSP2D x LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y ON x.I_IDSPP = y.I_IDSPP - WHERE y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' ) + WHERE C_SP2D_SAH=1 AND y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' ) ); $unitSatuan = UnitSatuan::orderBy("id")->get(); return view('realisasi_belanja.submit', compact("BelanjaRealisasi","BelanjaRealisasiKontrak","vwAKB","vwSPD","vwSP2D","unitSatuan")); @@ -298,11 +298,16 @@ class RealisasiBelanjaController extends Controller public function inputRealisasi(Request $request, $id) { $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew(); + $jmlRealisasi = DB::select(DB::raw("SELECT sum(REALISASI) as jml FROM NEWSIPKD.VW_BKU_REALISASI_RSK + WHERE IDRSK = ".$BelanjaRealisasi->kode_rsk)); + $jmlRealisasi = $jmlRealisasi[0]; + $req = $request->all(); $redirect = isset($req["redirect_link"])?$req["redirect_link"]:URL::to("/realisasi-belanja"); if ($request->isMethod('post')) { try{ DB::beginTransaction(); + $data["jumlah_realisasi"] = $jmlRealisasi->jml; $data["volume_satuan_realisasi"] = $req["vol_realisasi"]; $data["unit_satuan_realisasi"] = $req["unit_realisasi"]; $data["realisasi_by"] = Auth::user()->id; @@ -318,7 +323,7 @@ class RealisasiBelanjaController extends Controller } $unitSatuan = UnitSatuan::orderBy("id")->get(); - return view('realisasi_belanja.form_input_realisasi',compact("BelanjaRealisasi", "unitSatuan","redirect")); + return view('realisasi_belanja.form_input_realisasi',compact("BelanjaRealisasi", "jmlRealisasi", "unitSatuan","redirect")); } public function datatableInputRealisasi(Request $request) diff --git a/app/Http/Controllers/RealisasiPendapatanController.php b/app/Http/Controllers/RealisasiPendapatanController.php index bc6c872..c2e28b8 100644 --- a/app/Http/Controllers/RealisasiPendapatanController.php +++ b/app/Http/Controllers/RealisasiPendapatanController.php @@ -190,9 +190,14 @@ class RealisasiPendapatanController extends Controller $data["rkud_nama_akun"] = $req["rkud_nama_akun"]; $data["rkud_jumlah"] = replaceMoney($req["rkud_jumlah"]); $data->save(); - DB::commit(); + $userAnggaran = User::where("role_name","anggaran")->get()->toArray(); + $userAnggaran = array_column($userAnggaran,"id"); + $url = URL::to("/realisasi-pendapatan/".$realisasiId); + $message = "Realisasi Pendapatan dengan No. SP2D BUN ".$data["simtrad4_sp2d_bun"]." telah divalidasi oleh Bidang Perben!"; + $this->sendNotif("anggaran", "bendahara", $userAnggaran, $message, $url, "Realisasi Pendapatan", $data->id); + return redirect(URL::to("/realisasi-pendapatan"))->with('success','STS berhasil diinput.'); }catch(\Exception $e){ diff --git a/resources/views/realisasi_belanja/form_input_realisasi.blade.php b/resources/views/realisasi_belanja/form_input_realisasi.blade.php index 45efcae..467bc78 100644 --- a/resources/views/realisasi_belanja/form_input_realisasi.blade.php +++ b/resources/views/realisasi_belanja/form_input_realisasi.blade.php @@ -9,6 +9,12 @@ +