Maintenance DBH dan DAK

app/Http/Controllers/Admin/PermissionsController.php

@@ -14,7 +14,7 @@ class PermissionsController extends Controller
 
     public function index()
     {
-        $data = Permission::latest()->paginate(10);
+        $data = Permission::latest()->orderby("name")->paginate(10);
     
         return view('admin.mst_permission.index',compact('data'))
             ->with('i', (request()->input('page', 1) - 1) * 10);

app/Http/Controllers/JadwalSalurdanaController.php

@@ -42,7 +42,7 @@ class JadwalSalurdanaController extends Controller
                     (
                         SELECT * FROM (
                             SELECT ID_SPS,extract(month from RKUD_TGL) AS BULAN,RKUD_JUMLAH  
-                            FROM SAMASA.DBH_PENDAPATAN_REALISASI 
+                            FROM SAMASA.PENDAPATAN_REALISASI 
                             WHERE TAHUN=\''.$ta.'\' 
                         )
                         PIVOT
@@ -70,11 +70,11 @@ class JadwalSalurdanaController extends Controller
         ]);
     }
 
-    public function index_cht_dak(Request $request,$typeJadwal)
+    public function index_cht_dak(Request $request,$typeDana)
     {   
-        $judul = strtoupper($typeJadwal);
+        $judul = strtoupper($typeDana);
         $this->setTitle("Jadwal Salur Dana $judul");
-        return view("jadwal_salurdana.index_".$typeJadwal);
+        return view("jadwal_salurdana.index_".$typeDana);
     }
 
     public function datatable_cht_dak(Request $request)
@@ -88,7 +88,7 @@ class JadwalSalurdanaController extends Controller
         $dataFilter=0;
         $sqlstr = 'SELECT x.kode_rsk, x.nama_rsk, x.jumlah_anggaran, y.*  
                     FROM 
-                    SAMASA.DBH_BELANJA_REALISASI x 
+                    SAMASA.BELANJA_REALISASI x 
                     LEFT JOIN 
                     ( 
                         SELECT * FROM (

app/Http/Controllers/NotifikasiController.php

@@ -27,11 +27,11 @@ class NotifikasiController extends Controller
     {
     }
 
-    public function edit(DbhBelanjaRealisasi $realisasi_belanja)
+    public function edit(BelanjaRealisasi $realisasi_belanja)
     {
     }
 
-    public function update(Request $request, DbhBelanjaRealisasi $realisasi_belanja)
+    public function update(Request $request, BelanjaRealisasi $realisasi_belanja)
     {
     }
 
@@ -57,7 +57,7 @@ class NotifikasiController extends Controller
         ]);
     }
 
-    public function destroy(DbhBelanjaRealisasi $realisasi_belanja)
+    public function destroy(BelanjaRealisasi $realisasi_belanja)
     {
         // try{
         //     DB::beginTransaction();
@@ -74,7 +74,7 @@ class NotifikasiController extends Controller
         // }
     }
 
-    public function show(DbhBelanjaRealisasi $realisasi_belanja)
+    public function show(BelanjaRealisasi $realisasi_belanja)
     {
         // if (!Auth::user()->can("Lihat SKPP")){
         //     abort(403, 'Youre not allowed to visit this page!');

app/Http/Controllers/RealisasiBelanjaController.php

@@ -7,8 +7,8 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Facades\Excel;
-use App\Models\DbhBelanjaRealisasi;
+use App\Models\BelanjaRealisasi;
-use App\Models\DbhBelanjaRealisasiDetail;
+use App\Models\BelanjaRealisasiDetail;
 use App\Models\TempRealisasiBelanja;
 use App\Models\VwAkbSpdRealRsk;
 use App\Models\UnitSatuan;
@@ -18,7 +18,7 @@ use App\Imports\RealisasiBelanjaImport;
 class RealisasiBelanjaController extends Controller
 {
     public function __construct(){
-        $this->siteTitle = "DBH Realisasi Belanja";
+        $this->siteTitle = "Realisasi Belanja";
         parent::__construct();
     }
 
@@ -35,20 +35,22 @@ class RealisasiBelanjaController extends Controller
     {
     }
 
-    public function edit(DbhBelanjaRealisasi $realisasi_belanja)
+    public function edit(BelanjaRealisasi $realisasi_belanja)
     {
     }
 
-    public function update(Request $request, DbhBelanjaRealisasi $realisasi_belanja)
+    public function update(Request $request, BelanjaRealisasi $realisasi_belanja)
     {
     }
 
     public function submit(Request $request, $id)
     {
-        $this->setSubtitle("Detail");
+        $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew();
-        $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew();
+        // var_dump($BelanjaRealisasi->kode_rsk,$BelanjaRealisasi->kode_sub_kegiatan); exit;
-        // var_dump($DbhBelanjaRealisasi->kode_rsk,$DbhBelanjaRealisasi->kode_sub_kegiatan); exit;
+        $this->setTitle("Realisasi Belanja ".$BelanjaRealisasi->jenis_dana." ".$BelanjaRealisasi->sub_jenis_dana);
-        $vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$DbhBelanjaRealisasi->kode_rsk)->firstorNew();
+        $this->setSubtitle("Detail Data");
+        $vwAKB = VwAkbSpdRealRsk::where("I_IDRSK",$BelanjaRealisasi->kode_rsk)->firstorNew();
+        
         $vwSPD = DB::select(DB::raw(
                     'SELECT x.I_SPDNO_DOK,x.D_SPDNO,sum(y.V_SPD) AS JML 
                     FROM NEWSIPKD.TMSPD x
@@ -58,25 +60,22 @@ class RealisasiBelanjaController extends Controller
                     ON y.I_IDSUBGIAT = z.I_ID 
                     LEFT JOIN NEWSIPKD.TROPD a 
                     ON x.I_IDOPD = a.I_ID 
-                    WHERE z.C_SUBGIAT = \''.$DbhBelanjaRealisasi->kode_sub_kegiatan.'\' 
+                    WHERE z.C_SUBGIAT = \''.$BelanjaRealisasi->kode_sub_kegiatan.'\' 
-                    AND a.C_OPD  = \''.$DbhBelanjaRealisasi->kode_skpd.'\' 
+                    AND a.C_OPD  = \''.$BelanjaRealisasi->kode_skpd.'\' 
-                    AND x.C_ANGG_TAHUN = \''.$DbhBelanjaRealisasi->tahun_anggaran.'\'
+                    AND x.C_ANGG_TAHUN = \''.$BelanjaRealisasi->tahun_anggaran.'\'
                     GROUP BY x.I_SPDNO_DOK,x.D_SPDNO 
                     ORDER BY x.D_SPDNO '
                 ));
+
         $vwSP2D = DB::select(DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,
                     TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP 
                     FROM NEWSIPKD.TMSP2D x 
                     LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
                     ON x.I_IDSPP = y.I_IDSPP 
-                    WHERE y.I_IDRSK='.$DbhBelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
+                    WHERE y.I_IDRSK='.$BelanjaRealisasi->kode_rsk.' ORDER BY x.D_SP2D_SAH ' )
                 );
         
-        // foreach($vwSP2D as $key=>$sp2d){
+        return view('realisasi_belanja.submit', compact("BelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
-        //     var_dump($sp2d->i_sp2dno_dok);
-        // }
-        // exit;
-        return view('realisasi_belanja.submit', compact("DbhBelanjaRealisasi","vwAKB","vwSPD","vwSP2D"));
     }
 
     public function datatable(Request $request)
@@ -87,7 +86,7 @@ class RealisasiBelanjaController extends Controller
         $src = isset($post["search"])?$post["search"]["value"]:"";
 
         $dataFilter=0;
-        $data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM DBH_BELANJA_REALISASI x 
+        $data = DB::select(DB::raw('SELECT x.*,y.JML_REALISASI_SP2D FROM BELANJA_REALISASI x 
                     LEFT JOIN (
                         SELECT I_IDRSK,SUM(y.V_SPP) AS JML_REALISASI_SP2D 
                         FROM NEWSIPKD.TMSP2D x 
@@ -108,7 +107,7 @@ class RealisasiBelanjaController extends Controller
         }
 
         $dataFilter = count($data);
-        $dataTotal = DbhBelanjaRealisasi::count();
+        $dataTotal = BelanjaRealisasi::count();
 
         return response()->json([
             "recordsTotal" => $dataTotal,
@@ -117,24 +116,24 @@ class RealisasiBelanjaController extends Controller
         ]);
     }
 
-    public function destroy(DbhBelanjaRealisasi $realisasi_belanja)
+    public function destroy(BelanjaRealisasi $realisasi_belanja)
     {
         try{
             DB::beginTransaction();
             $realisasi_belanja->delete();
             DB::commit();
-            return redirect('dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                             ->with('success','Data Realisasi Pendapatan berhasil dihapus!');
 
         }catch(Throwable $e){
 
             DB::rollBack();
-            return redirect('dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                                 ->with('error','Data Realisasi Pendapatan gagal dihapus.');
         }
     }
 
-    public function show(DbhBelanjaRealisasi $realisasi_belanja)
+    public function show(BelanjaRealisasi $realisasi_belanja)
     {
         // if (!Auth::user()->can("Lihat SKPP")){
         //     abort(403, 'Youre not allowed to visit this page!');
@@ -143,10 +142,11 @@ class RealisasiBelanjaController extends Controller
         return view('realisasi_belanja.show',compact("realisasi_belanja"));
     }
 
-    public function upload(Request $request)
+    public function upload(Request $request, $typeDana)
     {
         $method = $request->method();
-        $this->setSubtitle("Upload Data Rencana Belanja");
+        $this->setTitle("Upload Rencana Belanja ".strtoupper($typeDana));
+        $this->setSubtitle("Upload File");
         if ($request->isMethod('post')) {
             $req = $request->all();
             try{
@@ -155,6 +155,7 @@ class RealisasiBelanjaController extends Controller
                 ]);
             
                 $file = $request->file('file');
+                $subJenisDana = $request->optJenisDana;
                 // echo 'File Name: '.$file->getClientOriginalName();
                 // echo 'File Extension: '.$file->getClientOriginalExtension();
                 // echo 'File Real Path: '.$file->getRealPath();
@@ -164,18 +165,18 @@ class RealisasiBelanjaController extends Controller
                 $file->move($tujuan_upload,$file->getClientOriginalName());
                 // var_dump($file->getRealPath()); exit;
                 DB::beginTransaction();
-                TempRealisasiBelanja::truncate();
+                TempRealisasiBelanja::where("userid",Auth::user()->id)->truncate();
-                Excel::import(new RealisasiBelanjaImport, $tujuan_upload."/".$file->getClientOriginalName());
+                Excel::import(new RealisasiBelanjaImport(strtoupper($typeDana),$subJenisDana), $tujuan_upload."/".$file->getClientOriginalName());
                 DB::commit();
-                return redirect('dbh/upload-realisasi-belanja')->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!');
+                return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Rencana belanja berhasil diupload, Silahkan validasi data!');
             }catch(\Exception $e){
                 throw new \Exception($e->getMessage());
                 DB::rollBack();
-                return redirect('dbh/upload-realisasi-belanja')->with('error',$e->getMessage());
+                return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage());
             }
         }
         $this->siteTitle = "Rencana Belanja";
-        return view('realisasi_belanja.upload');
+        return view('realisasi_belanja.upload',compact("typeDana"));
     }
 
     public function uploadDatatable(Request $request)
@@ -208,20 +209,20 @@ class RealisasiBelanjaController extends Controller
         ]);
     }
 
-    public function uploadValidate(Request $request)
+    public function uploadValidate(Request $request, $typeDana)
     {
         try{
             DB::beginTransaction();
             $datas = TempRealisasiBelanja::orderBy("id","ASC")->get();
             for($i=0;$i<$datas->count();$i++){
-                $cekData = DbhBelanjaRealisasi::where([
+                $cekData = BelanjaRealisasi::where([
                     "kode_rsk"=>$datas[$i]["kode_rsk"],
                     // "kode_rekening"=>$datas[$i]["kode_rekening"]
                 ])->firstOrNew();
                 
                 if (!$cekData==null){
                     $cekData->delete();
-                    // DbhBelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->delete();
+                    // BelanjaRealisasi::where(["kode_rsk"=>$datas[$i]["kode_rsk"],"kode_rekening"=>$datas[$i]["kode_rekening"]])->delete();
                 }
                 $input = [
                     "tahun_anggaran"=>$datas[$i]["tahun_anggaran"],
@@ -237,77 +238,29 @@ class RealisasiBelanjaController extends Controller
                     "nama_sub_kegiatan"=>$datas[$i]["nama_sub_kegiatan"],
                     "kode_rsk"=>$datas[$i]["kode_rsk"],
                     "nama_rsk"=>$datas[$i]["nama_rsk"],
-                    // "kode_rekening"=>$datas[$i]["kode_rekening"],
-                    // "nama_rekening"=>$datas[$i]["nama_rekening"],
                     "jumlah_anggaran"=>$datas[$i]["jumlah_anggaran"],
                     "volume_satuan"=>$datas[$i]["volume_satuan"],
-                    "unit_satuan"=>$datas[$i]["unit_satuan"]
+                    "unit_satuan"=>$datas[$i]["unit_satuan"],
+                    "jenis_dana"=>$datas[$i]["jenis_dana"],
+                    "sub_jenis_dana"=>$datas[$i]["sub_jenis_dana"],
+                    "created_by"=>$datas[$i]["userid"]
                 ];
-                DbhBelanjaRealisasi::create($input);
+                BelanjaRealisasi::create($input);
             }
             TempRealisasiBelanja::truncate();
             DB::commit();
-            return redirect('/dbh/upload-realisasi-belanja')->with('success','Data Realisasi belanja berhasil diupload.');
+            return redirect('/upload-realisasi-belanja/'.$typeDana)->with('success','Data Realisasi belanja berhasil diupload.');
         }catch(\Exception $e){
             throw new \Exception($e->getMessage());
             DB::rollBack();
-            return redirect('/dbh/upload-realisasi-belanja')->with('error',$e->getMessage());
+            return redirect('/upload-realisasi-belanja/'.$typeDana)->with('error',$e->getMessage());
         }
         return view('realisasi_belanja.upload');
     }
 
-    // public function inputRealisasi(Request $request, $id)
-    // {
-    //     $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); 
-    //     $req = $request->all();
-    //     $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"/dbh/realisasi-belanja";
-    //     if ($request->isMethod('post')) {
-    //         try{
-    //             DB::beginTransaction();
-
-    //             $DbhBelanjaRealisasiDetail = DbhBelanjaRealisasiDetail::where(["dbh_belanja_realisasi_id"=>$id,"no_sp2d"=>$req["no_sp2d"]]);
-    //             $data["dbh_belanja_realisasi_id"] = $id;
-    //             $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
-    //             $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
-    //             $data["jumlah_realisasi"] = replaceMoney($req["jml_realisasi"]);
-    //             $data["no_sp2d"] = $req["no_sp2d"];
-    //             $data["created_by"] = Auth::user()->id;
-    //             // var_dump($DbhBelanjaRealisasiDetail->count()); exit;
-    //             if ($DbhBelanjaRealisasiDetail->count()==0){
-    //                 DbhBelanjaRealisasiDetail::create($data);
-    //             }else{
-    //                 $DbhBelanjaRealisasiDetail->firstorNew()->update($data);
-    //             }
-
-    //             DB::commit();
-    
-    //             return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
-    //         }catch(\Exception $e){
-    //             throw new \Exception($e->getMessage());
-    //             DB::rollBack();
-    //             return redirect($redirect)->with('error',$e->getMessage());
-    //         }
-    //     }
-
-    //     $DbhBelanjaRealisasiDetail = DB::select(
-    //         DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
-    //                         a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID  
-    //                         FROM NEWSIPKD.TMSP2D x 
-    //                         LEFT JOIN NEWSIPKD.TMSPPRINCIBLJRSK y 
-    //                         ON x.I_IDSPP = y.I_IDSPP 
-    //                         LEFT JOIN SAMASA.DBH_BELANJA_REALISASI_DETAIL a 
-    //                         ON x.I_SP2DNO_DOK = a.NO_SP2D 
-    //                         WHERE x.I_ID='.$request->id_sp2d.' ORDER BY x.D_SP2D_SAH ' )
-    //     );
-    //     $DbhBelanjaRealisasiDetail = $DbhBelanjaRealisasiDetail == null ? null : $DbhBelanjaRealisasiDetail[0];
-    //     $unitSatuan = UnitSatuan::orderBy("id")->get();
-
-    //     return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "DbhBelanjaRealisasiDetail", "unitSatuan","redirect"));
-    // }
-
     public function inputRealisasi(Request $request, $id)
     {
-        $DbhBelanjaRealisasi = DbhBelanjaRealisasi::where("id", $id)->firstOrNew(); 
+        $BelanjaRealisasi = BelanjaRealisasi::where("id", $id)->firstOrNew(); 
         $req = $request->all();
         $redirect = isset($req["redirect_link"])?$req["redirect_link"]:"realisasi-belanja";
         if ($request->isMethod('post')) {
@@ -316,7 +269,7 @@ class RealisasiBelanjaController extends Controller
                 $data["volume_satuan_realisasi"] = $req["vol_realisasi"];
                 $data["unit_satuan_realisasi"] = $req["unit_realisasi"];
                 $data["realisasi_by"] = Auth::user()->id;
-                $DbhBelanjaRealisasi->update($data);
+                $BelanjaRealisasi->update($data);
                 DB::commit();
     
                 return redirect($redirect)->with('success','Data Realisasi berhasil di input!');
@@ -328,7 +281,7 @@ class RealisasiBelanjaController extends Controller
         }
 
         $unitSatuan = UnitSatuan::orderBy("id")->get();
-        return view('realisasi_belanja.form_input_realisasi',compact("DbhBelanjaRealisasi", "unitSatuan","redirect"));
+        return view('realisasi_belanja.form_input_realisasi',compact("BelanjaRealisasi", "unitSatuan","redirect"));
     }
 
     public function datatableInputRealisasi(Request $request)
@@ -339,7 +292,7 @@ class RealisasiBelanjaController extends Controller
         $src = isset($post["search"])?$post["search"]["value"]:"";
 
         $dataFilter=0;
-        //$data = DbhBelanjaRealisasiDetail::where(["DBH_BELANJA_REALISASI_ID"=>$request->id])->orderBy("id","ASC");
+        //$data = BelanjaRealisasiDetail::where(["DBH_BELANJA_REALISASI_ID"=>$request->id])->orderBy("id","ASC");
         $data = DB::select(
                     DB::raw('SELECT x.I_ID as IDSP2D, x.I_IDOPD,x.I_SP2DNO_DOK,TO_CHAR(x.D_SP2D_SAH,\'DD-MM-YYYY\') AS D_SP2D_SAH,x.V_SPP,
                                     a.no_sp2d,a.jumlah_realisasi,a.VOLUME_SATUAN_REALISASI,a.UNIT_SATUAN_REALISASI,a.ID  
@@ -362,17 +315,17 @@ class RealisasiBelanjaController extends Controller
 
     public function deleteDetail($id)
     {
-        $data = DbhBelanjaRealisasiDetail::where('id', $id)->firstorNew();
+        $data = BelanjaRealisasiDetail::where('id', $id)->firstorNew();
         try{
             DB::beginTransaction();
             $data->delete();
             DB::commit();
-            return redirect('/dbh/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('success','Data detail Realisasi belanja berhasil dihapus!');
+            return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('success','Data detail Realisasi belanja berhasil dihapus!');
 
         }catch(Throwable $e){
 
             DB::rollBack();
-            return redirect('/dbh/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('error','Data detail Realisasi belanja gagal dihapus.');
+            return redirect('/realisasi-belanja/'.$data->dbh_belanja_realisasi_id."/submit")->with('error','Data detail Realisasi belanja gagal dihapus.');
         }
     }
 }

app/Http/Controllers/RealisasiPendapatanController.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Facades\Excel;
-use App\Models\DbhPendapatanRealisasi;
+use App\Models\PendapatanRealisasi;
 use App\Models\Sps_pendapatan;
 use App\Models\User;
 
@@ -60,32 +60,32 @@ class RealisasiPendapatanController extends Controller
             $data = $this->dataPendapatan($req);
             $data["created_by"] = Auth::user()->id;
 
-            $DbhPendapatanRealisasi = DbhPendapatanRealisasi::create($data);
+            $PendapatanRealisasi = PendapatanRealisasi::create($data);
 
             // SEND NOTIF
             $userBendahara = User::where("role_name","bendahara")->get()->toArray();
             $userBendahara = array_column($userBendahara,"id");
-            $url = "/dbh/realisasi-pendapatan/".$DbhPendapatanRealisasi->id;
+            $url = "/realisasi-pendapatan/".$PendapatanRealisasi->id;
             $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", $DbhPendapatanRealisasi->id);
+            $this->sendNotif("anggaran", "bendahara", $userBendahara, $message, $url, "Realisasi Pendapatan", $PendapatanRealisasi->id);
 
             DB::commit();
-            return redirect('/dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                                 ->with('success','Realisasi Pendapatan berhasil dibuat.');
         }catch(\Exception $e){
             DB::rollBack();
-            return redirect('/dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                                 ->with('error',$e->getMessage());
         }
     }
 
-    public function edit(DbhPendapatanRealisasi $realisasi_pendapatan)
+    public function edit(PendapatanRealisasi $realisasi_pendapatan)
     {
         $this->setSubtitle("Ubah Data");
         return view('realisasi_pendapatan.edit',compact('realisasi_pendapatan'));
     }
 
-    public function update(Request $request, DbhPendapatanRealisasi $realisasi_pendapatan)
+    public function update(Request $request, PendapatanRealisasi $realisasi_pendapatan)
     {
         try{
 
@@ -98,12 +98,12 @@ class RealisasiPendapatanController extends Controller
 
             DB::commit();
 
-            return redirect('/dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                                 ->with('success','Realisasi Pendapatan berhasil diubah.');
         }catch(Throwable $e){
             
             DB::rollBack();
-            return redirect('/dbh/realisasi-pendapatan')
+            return redirect('/realisasi-pendapatan')
                                 ->with('error','Realisasi Pendapatan gagal diubah!');
         }
     }
@@ -126,12 +126,12 @@ class RealisasiPendapatanController extends Controller
         $ta = $post["ta"];
 
         $dataFilter=0;
-        $data = DbhPendapatanRealisasi::orderBy("created_at","ASC");
+        $data = PendapatanRealisasi::orderBy("created_at","ASC");
         if (!empty($src)){
             $data->whereRaw("(LOWER(simtrad4_uraian) LIKE '%".strtolower($src)."%')");
         }
         $dataFilter = $data->count();
-        $dataTotal = DbhPendapatanRealisasi::count();
+        $dataTotal = PendapatanRealisasi::count();
 
         return response()->json([
             "recordsTotal" => $dataTotal,
@@ -140,24 +140,24 @@ class RealisasiPendapatanController extends Controller
         ]);
     }
 
-    public function destroy(DbhPendapatanRealisasi $realisasi_pendapatan)
+    public function destroy(PendapatanRealisasi $realisasi_pendapatan)
     {
         try{
             DB::beginTransaction();
             $realisasi_pendapatan->delete();
             DB::commit();
-            return redirect('/dbh/realisasi-pendapatan.index')
+            return redirect('/realisasi-pendapatan.index')
                             ->with('success','Data Realisasi Pendapatan berhasil dihapus!');
 
         }catch(Throwable $e){
 
             DB::rollBack();
-            return redirect('/dbh/realisasi-pendapatan.index')
+            return redirect('/realisasi-pendapatan.index')
                                 ->with('error','Data Realisasi Pendapatan gagal dihapus.');
         }
     }
 
-    public function show(DbhPendapatanRealisasi $realisasi_pendapatan)
+    public function show(PendapatanRealisasi $realisasi_pendapatan)
     {
         // if (!Auth::user()->can("Lihat SKPP")){
         //     abort(403, 'Youre not allowed to visit this page!');
@@ -182,10 +182,10 @@ class RealisasiPendapatanController extends Controller
             $date = date("Ymd");
             DB::beginTransaction();
 
-            $data = DbhPendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
+            $data = PendapatanRealisasi::firstOrNew(array('id' => $realisasiId));
             
             if ($data["simtrad4_bersih"]<>replaceMoney($req["rkud_jumlah"])){
-                return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
+                return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error', "Jumlah STS harus sama dengan Rencana !");
             }
             $data["rkud_tgl"] = $req["rkud_tgl"];
             $data["rkud_no_sts"] = $req["rkud_no_sts"];
@@ -196,11 +196,11 @@ class RealisasiPendapatanController extends Controller
             
             DB::commit();
 
-            return redirect('/dbh/realisasi-pendapatan')->with('success','STS berhasil diinput.');
+            return redirect('/realisasi-pendapatan')->with('success','STS berhasil diinput.');
         }catch(\Exception $e){
             
             DB::rollBack();
-            return redirect(url("/dbh/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage());
+            return redirect(url("/realisasi-pendapatan/".$realisasiId))->with('error',$e->getMessage());
         }
     }
 

app/Imports/RealisasiBelanjaImport.php

@@ -4,10 +4,18 @@ use App\Models\TempRealisasiBelanja;
 use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Concerns\Importable;
 use Maatwebsite\Excel\Concerns\WithStartRow;
+use Illuminate\Support\Facades\Auth;
 
 class RealisasiBelanjaImport implements ToModel, WithStartRow
 {
     use Importable;
+    protected $jenisDana;
+    protected $subjenisDana;
+
+    public function __construct($jenisDana, $subjenisDana){
+        $this->jenisDana = $jenisDana;
+        $this->subjenisDana = $subjenisDana;
+    }
 
     public function startRow(): int
     {
@@ -30,11 +38,12 @@ class RealisasiBelanjaImport implements ToModel, WithStartRow
             "nama_sub_kegiatan"=>$row[10],
             "kode_rsk"=>$row[11],
             "nama_rsk"=>$row[12],
-            // "kode_rekening"=>$row[13],
-            // "nama_rekening"=>$row[14],
             "jumlah_anggaran"=>$row[13],
             "volume_satuan"=>$row[14],
-            "unit_satuan"=>$row[15]
+            "unit_satuan"=>$row[15],
+            "jenis_dana"=>$this->jenisDana,
+            "sub_jenis_dana"=>$this->subjenisDana,
+            "userid"=>Auth::user()->id
         ]);
     }
 }

app/Models/BelanjaRealisasi.php

@@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
 
-class DbhBelanjaRealisasi extends Eloquent
+class BelanjaRealisasi extends Eloquent
 {
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.dbh_belanja_realisasi';
+    protected $table = 'SAMASA.belanja_realisasi';
     protected $fillable = [
         "tahun_anggaran",
         "jenis_belanja",
@@ -35,6 +35,9 @@ class DbhBelanjaRealisasi extends Eloquent
         "volume_satuan_realisasi",
         "unit_satuan_realisasi",
         "no_sp2d",
-        "realisasi_by"
+        "realisasi_by",
+        "created_by",
+        "jenis_dana",
+        "sub_jenis_dana"
     ];
 }

app/Models/BelanjaRealisasiDetail.php

@@ -6,11 +6,11 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
 
-class DbhBelanjaRealisasiDetail extends Eloquent
+class BelanjaRealisasiDetail extends Eloquent
 {
     use HasFactory;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.dbh_belanja_realisasi_detail';
+    protected $table = 'SAMASA.belanja_realisasi_detail';
     protected $fillable = [
         "dbh_belanja_realisasi_id",
         "jumlah_realisasi",

app/Models/PendapatanRealisasi.php

@@ -6,12 +6,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Yajra\Oci8\Eloquent\OracleEloquent as Eloquent;
 
-class DbhPendapatanRealisasi extends Eloquent
+class PendapatanRealisasi extends Eloquent
 {
     use HasFactory;
     use Uuids;
     protected $connection = 'Samasa';
-    protected $table = 'SAMASA.dbh_pendapatan_realisasi';
+    protected $table = 'SAMASA.pendapatan_realisasi';
     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'

app/Models/TempRealisasiBelanja.php

@@ -29,6 +29,9 @@ class TempRealisasiBelanja extends Eloquent
         "nama_rekening",
         "jumlah_anggaran",
         "volume_satuan",
-        "unit_satuan"
+        "unit_satuan",
+        "jenis_dana",
+        "sub_jenis_dana",
+        "userid"
     ];
 }

database/migrations/2022_07_11_093130_create_pendapatan_realisasi_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateDbhPendapatanRealisasiTable extends Migration
+class CreatePendapatanRealisasiTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateDbhPendapatanRealisasiTable extends Migration
      */
     public function up()
     {
-        Schema::create('dbh_pendapatan_realisasi', function (Blueprint $table) {
+        Schema::create('pendapatan_realisasi', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string('tahun',4);
             $table->integer('id_sps')->nullable();

database/migrations/2022_07_15_094519_create_temp_realisasi_belanja_table.php

@@ -28,11 +28,13 @@ class CreateTempRealisasiBelanjaTable extends Migration
             $table->string("nama_sub_kegiatan",150);
             $table->string("kode_rsk",50);
             $table->text("nama_rsk");
-            $table->string("kode_rekening",50);
+            $table->string("kode_rekening",50)->nullable();
-            $table->string("nama_rekening",150);
+            $table->string("nama_rekening",150)->nullable();
             $table->decimal('jumlah_anggaran', 19, 2);
             $table->tinyInteger('volume_satuan');
-            $table->string('unit_satuan',30);
+            $table->enum('jenis_dana',["DBH","DAK"]);
+            $table->enum('sub_jenis_dana',["All","CHT","Fisik","Non-Fisik"]);
+            $table->uuid('userid');
             $table->timestamps();
         });
     }

database/migrations/2022_07_18_090432_create_belanja_realisasi_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateDbhBelanjaRealisasiTable extends Migration
+class CreateBelanjaRealisasiTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateDbhBelanjaRealisasiTable extends Migration
      */
     public function up()
     {
-        Schema::create('dbh_belanja_realisasi', function (Blueprint $table) {
+        Schema::create('belanja_realisasi', function (Blueprint $table) {
             $table->uuid('id')->primary();
             $table->string("tahun_anggaran",4);
             $table->string("jenis_belanja",50);
@@ -28,8 +28,8 @@ class CreateDbhBelanjaRealisasiTable extends Migration
             $table->string("nama_sub_kegiatan",150);
             $table->string("kode_rsk",50);
             $table->text("nama_rsk");
-            $table->string("kode_rekening",50);
+            $table->string("kode_rekening",50)->nullable();
-            $table->string("nama_rekening",150);
+            $table->string("nama_rekening",150)->nullable();
             $table->decimal('jumlah_anggaran', 19, 2);
             $table->tinyInteger('volume_satuan');
             $table->string('unit_satuan',30);
@@ -38,6 +38,7 @@ class CreateDbhBelanjaRealisasiTable extends Migration
             $table->string('unit_satuan_realisasi',30)->nullable();
             $table->string("no_sp2d",30);
             $table->uuid('realisasi_by')->nullable();
+            $table->uuid('created_by')->nullable();
             $table->timestamps();
         });
     }
@@ -49,6 +50,6 @@ class CreateDbhBelanjaRealisasiTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('dbh_belanja_realisasi');
+        Schema::dropIfExists('belanja_realisasi');
     }
 }

database/migrations/2022_07_25_142112_create_belanja_realisasi_detail_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateDbhBelanjaRealisasiDetailTable extends Migration
+class CreateBelanjaRealisasiDetailTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateDbhBelanjaRealisasiDetailTable extends Migration
      */
     public function up()
     {
-        Schema::create('dbh_belanja_realisasi_detail', function (Blueprint $table) {
+        Schema::create('belanja_realisasi_detail', function (Blueprint $table) {
             $table->id();
             $table->uuid("dbh_belanja_realisasi_id");
             $table->decimal('jumlah_realisasi', 19, 2);
@@ -32,6 +32,6 @@ class CreateDbhBelanjaRealisasiDetailTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('dbh_belanja_realisasi_detail');
+        Schema::dropIfExists('belanja_realisasi_detail');
     }
 }

resources/views/partials/menu.blade.php

@@ -20,23 +20,23 @@
             <p>Jadwal Salur Dana<i class="right fas fa-angle-left"></i></p>
           </a>
           <ul class="nav nav-treeview">
-            <?php if (Auth::user()->can("Read DBH Jadwal")){ ?>
+            <?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
               <li class="nav-item">
                 <a href="{{ url('/jadwal-salurdana') }}" class="nav-link">
                   <i class="nav-icon fa fa-minus"></i>
-                  <p>All</p>
+                  <p>DBH All</p>
                 </a>
               </li>
             <?php } ?>
-            <?php if (Auth::user()->can("Read DBH Jadwal")){ ?>
+            <?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
               <li class="nav-item">
                 <a href="{{ url('/jadwal-salurdana/cht') }}" class="nav-link">
                   <i class="nav-icon fa fa-minus"></i>
-                  <p>CHT</p>
+                  <p>DBH CHT</p>
                 </a>
               </li>
             <?php } ?>
-            <?php if (Auth::user()->can("Read DBH Jadwal")){ ?>
+            <?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
               <li class="nav-item">
                 <a href="{{ url('/jadwal-salurdana/dak') }}" class="nav-link">
                   <i class="nav-icon fa fa-minus"></i>
@@ -46,70 +46,56 @@
             <?php } ?>
           </ul>
         </li>  
-        <?php if (Auth::user()->can("Read DBH Realisasi Pendapatan")){ ?>
+        <?php if (Auth::user()->can("Read DBH Realisasi Pendapatan") || $role == "superadmin"){ ?>
           <li class="nav-item">
-            <a href="{{ url('/dbh/realisasi-pendapatan') }}" class="nav-link">
+            <a href="{{ url('/realisasi-pendapatan') }}" class="nav-link">
-              <i class="fa fa-minus nav-icon"></i>
+              <i class="fas fa-th nav-icon"></i>
               <p>Realisasi Pendapatan</p>
             </a>
           </li>
         <?php } ?>
         <li class="nav-item">
           <a href="#" class="nav-link">
-            <i class="fas fa-arrow-alt-left nav-icon"></i>
+            <i class="fas fa-th nav-icon"></i>
             <p>Belanja <i class="right fas fa-angle-left"></i></p>
           </a>
           <ul class="nav nav-treeview">
-            <?php if (Auth::user()->can("Upload DBH Rencana Belanja")){ ?>
+            <?php if (Auth::user()->can("Upload DBH Rencana Belanja") || $role == "superadmin"){ ?>
               <li class="nav-item">
-                <a href="{{ url('/dbh/upload-realisasi-belanja') }}" class="nav-link">
-                  <i class="fa fa-minus nav-icon"></i>
-                  <p>Upload Rencana Belanja</p>
-                </a>
-              </li>
-            <?php } ?>
-            <?php if (Auth::user()->can("Read DBH Realisasi Belanja")){ ?>
-              <li class="nav-item">
-                <a href="{{ url('/dbh/realisasi-belanja') }}" class="nav-link">
-                  <i class="fa fa-minus nav-icon"></i>
-                  <p>Realisasi Belanja</p>
-                </a>
-              </li>
-            <?php } ?>                
-          </ul>
-        </li>
-        {{-- <li class="nav-item">
                 <a href="#" class="nav-link">
-            <i class="nav-icon fas fa-th-large"></i>
+                  <i class="fas fa-table nav-icon"></i>
-            <p>Dana Alokasi Khusus<i class="right fas fa-angle-left"></i></p>
+                  <p>Upload Rencana Belanja <i class="right fas fa-angle-left"></i></p>
                 </a>
                 <ul class="nav nav-treeview">
-            <?php //if (Auth::user()->can("Read DAK Realisasi Pendapatan")){ ?>
+                  <?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
                     <li class="nav-item">
-                <a href="{{ url('/dak/realisasi-pendapatan') }}" class="nav-link">
+                      <a href="{{ url('/upload-realisasi-belanja/dbh') }}" class="nav-link">
-                  <i class="fa fa-minus nav-icon"></i>
+                        <i class="nav-icon fa fa-minus"></i>
-                  <p>Realisasi Pendapatan</p>
+                        <p>DBH</p>
                       </a>
                     </li>
-            <?php //} ?>
+                  <?php } ?>
-            <?php //if (Auth::user()->can("Upload DAK Rencana Belanja")){ ?>
+                  <?php if (Auth::user()->can("Read DBH Jadwal") || $role == "superadmin"){ ?>
                     <li class="nav-item">
-                <a href="{{ url('/dak/upload-realisasi-belanja') }}" class="nav-link">
+                      <a href="{{ url('/upload-realisasi-belanja/dak') }}" class="nav-link">
-                  <i class="fa fa-minus nav-icon"></i>
+                        <i class="nav-icon fa fa-minus"></i>
-                  <p>Upload Belanja</p>
+                        <p>DAK</p>
                       </a>
                     </li>
-            <?php //} ?>
+                  <?php } ?>
-            <?php //if (Auth::user()->can("Read DAK Realisasi Belanja")){ ?>
+                </ul>
+              </li>
+            <?php } ?>
+            <?php if (Auth::user()->can("Read DBH Realisasi Belanja") || $role == "superadmin"){ ?>
               <li class="nav-item">
-                <a href="{{ url('/dak/realisasi-belanja') }}" class="nav-link">
+                <a href="{{ url('/realisasi-belanja') }}" class="nav-link">
-                  <i class="fa fa-minus nav-icon"></i>
+                  <i class="fas fa-table nav-icon"></i>
                   <p>Realisasi Belanja</p>
                 </a>
               </li>
-            <?php //} ?>
+            <?php } ?>                
           </ul>
-        </li> --}}
+        </li>
         @if ($role == "admin" || $role == "superadmin")
           <li class="nav-header">MASTER DATA</li>
           <li class="nav-item"><a href="{{ url('/admin/users') }}" class="nav-link"><i class="nav-icon fas fa-th-large nav-icon"></i><p>Pengguna</p></a></li>

resources/views/realisasi_belanja/form_input_realisasi.blade.php

@@ -1,17 +1,17 @@
-<form id="frmInputRealisasi" action="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
+<form id="frmInputRealisasi" action="{{ url('/dbh/realisasi-belanja/'.$BelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
     @csrf
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12">
             <div class="form-group">
                 <label>Rinci Sub Kegiatan</label>
                 <input type="hidden" value="{{ $redirect }}" name="redirect_link">
-                <input type="hidden" value="{{ $DbhBelanjaRealisasi->nama_rsk }}" name="id_rsk">
+                <input type="hidden" value="{{ $BelanjaRealisasi->nama_rsk }}" name="id_rsk">
-                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $DbhBelanjaRealisasi->nama_rsk }}</textarea>
+                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $BelanjaRealisasi->nama_rsk }}</textarea>
             </div>
         </div>
         <div class="col-xs-6 col-sm-6 col-md-6">
             <div class="form-group">
-                <?php $volSatuan = empty($DbhBelanjaRealisasi->volume_satuan_realisasi) ? $DbhBelanjaRealisasi->volume_satuan: $DbhBelanjaRealisasi->volume_satuan_realisasi; ?>
+                <?php $volSatuan = empty($BelanjaRealisasi->volume_satuan_realisasi) ? $BelanjaRealisasi->volume_satuan: $BelanjaRealisasi->volume_satuan_realisasi; ?>
                 <label>Volume Realisasi</label>
                 <input type="number" id="vol_realisasi" required class="form-control" name="vol_realisasi" value="{{ $volSatuan }}" placeholder="Volume Realisasi">
             </div>
@@ -20,7 +20,7 @@
             <div class="form-group">
                 <label>Unit Realisasi</label>
                 <select id="unit_realisasi" name="unit_realisasi" class="form-control" required placeholder="Unit Realisasi">
-                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasi->unit_satuan_realisasi) ? $DbhBelanjaRealisasi->unit_satuan: $DbhBelanjaRealisasi->unit_satuan_realisasi; ?>
+                    <?php $unitSatuanVal = empty($BelanjaRealisasi->unit_satuan_realisasi) ? $BelanjaRealisasi->unit_satuan: $BelanjaRealisasi->unit_satuan_realisasi; ?>
                     <?php foreach($unitSatuan as $satuan){ ?>
                         <option {{ $unitSatuanVal == $satuan->nama_satuan ? "selected":"" }}>{{ $satuan->nama_satuan }}</option>    
                     <?php } ?>

resources/views/realisasi_belanja/form_input_realisasi.blade_SP2D.php

@@ -1,29 +1,29 @@
-<form id="frmInputRealisasi" action="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
+<form id="frmInputRealisasi" action="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/inputRealisasi') }}" method="POST" autocomplete="off">
     @csrf
     <div class="row">
         <div class="col-xs-12 col-sm-12 col-md-12">
             <div class="form-group">
                 <label>Rinci Sub Kegiatan</label>
                 <input type="hidden" value="{{ $redirect }}" name="redirect_link">
-                <input type="hidden" value="{{ $DbhBelanjaRealisasi->nama_rsk }}" name="id_rsk">
+                <input type="hidden" value="{{ $BelanjaRealisasi->nama_rsk }}" name="id_rsk">
-                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $DbhBelanjaRealisasi->nama_rsk }}</textarea>
+                <textarea type="text" id="rsk_realisasi" rows=4 required class="form-control" name="rsk_realisasi" disabled>{{ $BelanjaRealisasi->nama_rsk }}</textarea>
             </div>
         </div>
         <div class="col-xs-12 col-sm-12 col-md-12">
             <div class="form-group">
                 <label>No. SP2D</label>
-                <input type="text" id="no_sp2d" required class="form-control" name="no_sp2d" value="{{ $DbhBelanjaRealisasiDetail->i_sp2dno_dok }}" disabled>
+                <input type="text" id="no_sp2d" required class="form-control" name="no_sp2d" value="{{ $BelanjaRealisasiDetail->i_sp2dno_dok }}" disabled>
             </div>
         </div>
         <div class="col-xs-12 col-sm-12 col-md-12">
             <div class="form-group">
                 <label>Jumlah Realisasi</label>
-                <input type="text" id="jml_realisasi" required class="form-control" name="jml_realisasi" placeholder="Jumlah Realisasi" value="{{ separateNumberIndo($DbhBelanjaRealisasiDetail->v_spp) }}" disabled>
+                <input type="text" id="jml_realisasi" required class="form-control" name="jml_realisasi" placeholder="Jumlah Realisasi" value="{{ separateNumberIndo($BelanjaRealisasiDetail->v_spp) }}" disabled>
             </div>
         </div>
         <div class="col-xs-6 col-sm-6 col-md-6">
             <div class="form-group">
-                <?php $volSatuan = empty($DbhBelanjaRealisasiDetail->volume_satuan_realisasi) ? 0: $DbhBelanjaRealisasiDetail->volume_satuan_realisasi; ?>
+                <?php $volSatuan = empty($BelanjaRealisasiDetail->volume_satuan_realisasi) ? 0: $BelanjaRealisasiDetail->volume_satuan_realisasi; ?>
                 <label>Volume Realisasi</label>
                 <input type="number" id="vol_realisasi" required class="form-control" name="vol_realisasi" value="{{ $volSatuan }}" placeholder="Volume Realisasi">
             </div>
@@ -33,7 +33,7 @@
                 <label>Unit Realisasi</label>
                 <select id="unit_realisasi" name="unit_realisasi" class="form-control" required placeholder="Unit Realisasi">
                     <option></option>
-                    <?php $unitSatuanVal = empty($DbhBelanjaRealisasiDetail->unit_satuan_realisasi) ? "": $DbhBelanjaRealisasiDetail->unit_satuan_realisasi; ?>
+                    <?php $unitSatuanVal = empty($BelanjaRealisasiDetail->unit_satuan_realisasi) ? "": $BelanjaRealisasiDetail->unit_satuan_realisasi; ?>
                     <?php foreach($unitSatuan as $satuan){ ?>
                         <option {{ $unitSatuanVal == $satuan->nama_satuan ? "selected":"" }}>{{ $satuan->nama_satuan }}</option>    
                     <?php } ?>

resources/views/realisasi_belanja/index.blade.php

@@ -1,6 +1,6 @@
 @php
     $siteBreadcumb = [
-        ["url"=>"/dbh/realisasi-pendapatan","label"=>$siteTitle],
+        ["url"=>"/realisasi-pendapatan","label"=>$siteTitle],
     ];   
 @endphp
 
@@ -122,7 +122,7 @@
                 "ordering": false,
                 "autoWidth": false,
                 "ajax": {
-                    url: "/dbh/realisasi-belanja/datatable",
+                    url: "/realisasi-belanja/datatable",
                     type: "POST",
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -173,7 +173,7 @@
                     $("td:eq(0)", nRow).html(index);
                     $("td:eq(5)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
                     $("td:eq(8)", nRow).html(separateNumberIndo(aData["jml_realisasi_sp2d"]));
-                    $("td:eq(11)", nRow).html('<a href="/dbh/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
+                    $("td:eq(11)", nRow).html('<a href="/realisasi-belanja/' + aData["id"] +'/submit" class="btn btn-sm btn-default mr-2"><i class="fa fa-eye"></i></a>'+btnInput);
                     
                     return nRow;
                 },

resources/views/realisasi_belanja/submit.blade.php

@@ -1,7 +1,7 @@
 @php
     $siteBreadcumb = [
-        ["url"=>"/dbh/realisasi-pendapatan","label"=>$siteTitle],
+        ["url"=>"/realisasi-belanja","label"=>$siteTitle],
-        ["url"=>"/dbh/realisasi-pendapatan/create","label"=>$sitesubTitle]
+        ["url"=>"/realisasi-belanja/create","label"=>$sitesubTitle]
     ];   
 @endphp
 
@@ -21,12 +21,12 @@
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/dbh/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-belanja') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
                 {{-- @endif --}}
             </div>
         </div>
         <div class="card-body">
-            <form id="frmSalurdana" action="{{ url('/dbh/realisasi-belanja/submit') }}" method="POST" autocomplete="off">
+            <form id="frmSalurdana" action="{{ url('/realisasi-belanja/submit') }}" method="POST" autocomplete="off">
                 @csrf
                 @include('realisasi_belanja.form')
             </form>
@@ -135,7 +135,7 @@
                 <input type="text" class="form-control" name="unit_realisasi" disabled>
             </div>
             <?php if (Auth::user()->can("Input Realisasi DBH Realisasi Belanja")){ ?>
-                <a class="btn btn-success modalButton" title="Input Realisasi" href="{{ url('/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/inputRealisasi?redirect_link=/dbh/realisasi-belanja/'.$DbhBelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
+                <a class="btn btn-success modalButton" title="Input Realisasi" href="{{ url('/realisasi-belanja/'.$BelanjaRealisasi->id.'/inputRealisasi?redirect_link=/realisasi-belanja/'.$BelanjaRealisasi->id.'/submit') }}"><i class="fa fa-paper-plane"></i> Input Realisasi</a>
             <?php } ?>
         </div>
     </div>
@@ -160,44 +160,44 @@
     <script type="text/javascript">
         $(document).ready(function(){
             var srcDate1 = null, srcDate2 = null;
-            $("input[name=jenis]").val("{{ $DbhBelanjaRealisasi->jenis_belanja }}");
+            $("input[name=jenis]").val("{{ $BelanjaRealisasi->jenis_belanja }}");
             $("input[name=jenis]").attr("readonly", true);
-            $("input[name=sub_jenis]").val("{{ $DbhBelanjaRealisasi->sub_jenis_belanja }}");
+            $("input[name=sub_jenis]").val("{{ $BelanjaRealisasi->sub_jenis_belanja }}");
             $("input[name=sub_jenis]").attr("readonly", true);
 
-            let $newOptionProgram = $("<option selected='selected'></option>").val("{{ $DbhBelanjaRealisasi->kode_program }}").text("{{ $DbhBelanjaRealisasi->kode_program." | ".$DbhBelanjaRealisasi->nama_program }}")
+            let $newOptionProgram = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_program }}").text("{{ $BelanjaRealisasi->kode_program." | ".$BelanjaRealisasi->nama_program }}")
-            $("select[name=prog]").val("{{ $DbhBelanjaRealisasi->kode_program }}");
+            $("select[name=prog]").val("{{ $BelanjaRealisasi->kode_program }}");
             $("select[name=prog]").append($newOptionProgram).trigger('change');
             $("select[name=prog]").attr("disabled", true);
 
-            let $newOptionSkpd = $("<option selected='selected'></option>").val("{{ $DbhBelanjaRealisasi->kode_skpd }}").text("{{ $DbhBelanjaRealisasi->kode_skpd." | ".$DbhBelanjaRealisasi->nama_skpd }}")
+            let $newOptionSkpd = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_skpd }}").text("{{ $BelanjaRealisasi->kode_skpd." | ".$BelanjaRealisasi->nama_skpd }}")
-            $("select[name=skpd]").val("{{ $DbhBelanjaRealisasi->kode_skpd }}");
+            $("select[name=skpd]").val("{{ $BelanjaRealisasi->kode_skpd }}");
             $("select[name=skpd]").append($newOptionSkpd).trigger('change');
             $("select[name=skpd]").attr("disabled", true);
 
-            let $newOptionKegiatan = $("<option selected='selected'></option>").val("{{ $DbhBelanjaRealisasi->kode_kegiatan }}").text("{{ $DbhBelanjaRealisasi->kode_kegiatan." | ".$DbhBelanjaRealisasi->nama_kegiatan }}")
+            let $newOptionKegiatan = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_kegiatan }}").text("{{ $BelanjaRealisasi->kode_kegiatan." | ".$BelanjaRealisasi->nama_kegiatan }}")
-            $("select[name=keg]").val("{{ $DbhBelanjaRealisasi->kode_kegiatan }}");
+            $("select[name=keg]").val("{{ $BelanjaRealisasi->kode_kegiatan }}");
             $("select[name=keg]").append($newOptionKegiatan).trigger('change');
             $("select[name=keg]").attr("disabled", true);
 
-            let $newOptionSubKegiatan = $("<option selected='selected'></option>").val("{{ $DbhBelanjaRealisasi->kode_sub_kegiatan }}").text("{{ $DbhBelanjaRealisasi->kode_sub_kegiatan." | ".$DbhBelanjaRealisasi->nama_sub_kegiatan }}")
+            let $newOptionSubKegiatan = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_sub_kegiatan }}").text("{{ $BelanjaRealisasi->kode_sub_kegiatan." | ".$BelanjaRealisasi->nama_sub_kegiatan }}")
-            $("select[name=sk]").val("{{ $DbhBelanjaRealisasi->kode_sub_kegiatan }}");
+            $("select[name=sk]").val("{{ $BelanjaRealisasi->kode_sub_kegiatan }}");
             $("select[name=sk]").append($newOptionSubKegiatan).trigger('change');
             $("select[name=sk]").attr("disabled", true);
 
-            let $newOptionRSK = $("<option selected='selected'></option>").val("{{ $DbhBelanjaRealisasi->kode_rsk }}").text("{{ $DbhBelanjaRealisasi->kode_rsk." | ".$DbhBelanjaRealisasi->nama_rsk }}")
+            let $newOptionRSK = $("<option selected='selected'></option>").val("{{ $BelanjaRealisasi->kode_rsk }}").text("{{ $BelanjaRealisasi->kode_rsk." | ".$BelanjaRealisasi->nama_rsk }}")
-            $("select[name=rsk]").val("{{ $DbhBelanjaRealisasi->kode_rsk }}");
+            $("select[name=rsk]").val("{{ $BelanjaRealisasi->kode_rsk }}");
             $("select[name=rsk]").append($newOptionRSK).trigger('change');
             $("select[name=rsk]").attr("disabled", true);
 
-            $("input[name=anggaran]").val("{{ separateNumberIndo($DbhBelanjaRealisasi->jumlah_anggaran) }}");
+            $("input[name=anggaran]").val("{{ separateNumberIndo($BelanjaRealisasi->jumlah_anggaran) }}");
             $("input[name=anggaran]").attr("readonly", true);
-            $("input[name=vol]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan)?$DbhBelanjaRealisasi->volume_satuan:0 }}");
+            $("input[name=vol]").val("{{ isset($BelanjaRealisasi->volume_satuan)?$BelanjaRealisasi->volume_satuan:0 }}");
             $("input[name=vol]").attr("readonly", true);
-            $("input[name=unit]").val("{{ $DbhBelanjaRealisasi->unit_satuan }}");
+            $("input[name=unit]").val("{{ $BelanjaRealisasi->unit_satuan }}");
             $("input[name=unit]").attr("readonly", true);
-            $("input[name=vol_realisasi]").val("{{ isset($DbhBelanjaRealisasi->volume_satuan_realisasi)?$DbhBelanjaRealisasi->volume_satuan_realisasi:0 }}");
+            $("input[name=vol_realisasi]").val("{{ isset($BelanjaRealisasi->volume_satuan_realisasi)?$BelanjaRealisasi->volume_satuan_realisasi:0 }}");
-            $("input[name=unit_realisasi]").val("{{ isset($DbhBelanjaRealisasi->unit_satuan_realisasi)?$DbhBelanjaRealisasi->unit_satuan_realisasi:0 }}");
+            $("input[name=unit_realisasi]").val("{{ isset($BelanjaRealisasi->unit_satuan_realisasi)?$BelanjaRealisasi->unit_satuan_realisasi:0 }}");
 
         });
     </script>

resources/views/realisasi_belanja/upload.blade.php

@@ -1,8 +1,16 @@
 @php
     $siteBreadcumb = [
-        ["url"=>"/dbh/realisasi-belanja","label"=>$siteTitle],
+        ["url"=>"/realisasi-belanja","label"=>$siteTitle],
-        ["url"=>"/dbh/realisasi-belanja/create","label"=>$sitesubTitle]
+        ["url"=>"/realisasi-belanja/create","label"=>$sitesubTitle]
     ];   
+
+    $jenisDana = [];
+    if ($typeDana == "dbh"){
+        $jenisDana = ["All","CHT"];
+    }else if($typeDana == "dak"){
+        $jenisDana = ["Fisik","Non-Fisik"];
+    }
+
 @endphp
 
 @extends('layouts.empty')
@@ -21,11 +29,21 @@
             <div class="card-tools"></div>
         </div>
         <div class="card-body">
-            <form id="uploadData" action="/dbh/upload-realisasi-belanja" method="POST" autocomplete="off" enctype="multipart/form-data">
+            <form id="uploadData" action="/upload-realisasi-belanja/{{ $typeDana }}" method="POST" autocomplete="off" enctype="multipart/form-data">
                 @csrf
                 <div class="form-group">
-                    <b>File Gambar</b><br/>
+                    <label>Jenis Dana</label>
-                    <input type="file" name="file" required>
+                    <select class="form-control" required name="optJenisDana">
+                        @php 
+                            foreach($jenisDana as $dana){
+                                echo "<option value='$dana'>$dana</option>";
+                            }
+                        @endphp
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label>File Gambar</label>
+                    <input class="form-control" type="file" name="file" required>
                 </div>
                 <div class="form-group"><button type="submit" class="btn btn-sm btn-success"><i class="fas fa-file-excel"></i> Upload File</button></div>
                 <p><strong>Format:xlsx | Columns:</strong> 
@@ -42,8 +60,6 @@
                     "nama_sub_kegiatan",
                     "kode_rsk",
                     "nama_rsk",
-                    {{-- "kode_rekening",
-                    "nama_rekening", --}}
                     "jumlah_anggaran",
                     "volume_satuan",
                     "unit_satuan"</p>
@@ -55,7 +71,7 @@
             <h2 class="card-title"><i class="fa fa-check mr-2"></i> Validasi Data Rencana Belanja</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button id="upload_validated" class="btn btn-sm btn-default"><i class="fa fa-save"></i>  Upload Data</button>
+                    <button id="upload_validated" class="btn btn-sm btn-warning"><i class="fa fa-save"></i>  Upload Data</button>
                 {{-- @endif --}}
             </div>
         </div>
@@ -69,7 +85,7 @@
                             "Nama Program", "Kode SKPD", "Nama SKPD", "Kode Kegiatan", "Nama Kegiatan", "Kode Sub Kegiatan", 
                             "Nama Sub Kegiatan", "Kode RSK", "Nama RSK", 
                             //"Kode Rek", "Nama Rek", 
-                            "Anggaran", "Volume", "Unit");
+                            "Anggaran", "Volume", "Unit","Jenis Dana","Sub Jenis Dana");
                             foreach($arrCol as $rowCol){
                                 echo "<th>$rowCol</th>";
                             }
@@ -101,7 +117,7 @@
             $(document).on("click","#upload_validated",function (e){
                 e.preventDefault();
                 let test = Swal.fire({
-                    title: 'Data Rencana Belanja akan diUpload?',
+                    title: 'Data Rencana Belanja {{ strtoupper($typeDana) }} akan diUpload?',
                     showDenyButton: true,
                     showCancelButton: false,
                     confirmButtonText: 'Ya',
@@ -110,7 +126,7 @@
                 }).then((result) => {
                     /* Read more about isConfirmed, isDenied below */
                     if (result.isConfirmed) {
-                        location.href='{{ url('/dbh/upload-realisasi-belanja/upload') }}';
+                        location.href='{{ url('/upload-realisasi-belanja/'.$typeDana.'/upload') }}';
                     }
                 })
             });
@@ -121,7 +137,7 @@
                 "ordering": false,
                 "autoWidth": false,
                 "ajax": {
-                    url: "/dbh/upload-realisasi-belanja/datatable",
+                    url: "/upload-realisasi-belanja/{{ $typeDana }}/datatable",
                     type: "POST",
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -153,11 +169,11 @@
                     { "data": "nama_sub_kegiatan", "className":"text-left", "defaultContent":"-" },  
                     { "data": "kode_rsk", "className":"text-center", "defaultContent":"-" },  
                     { "data": "nama_rsk", "className":"text-left", "defaultContent":"-", "width":300 },  
-                    // { "data": "kode_rekening", "className":"text-center", "defaultContent":"-" },  
-                    // { "data": "nama_rekening", "className":"text-left", "defaultContent":"-" },  
                     { "data": "jumlah_anggaran", "className":"text-right", "defaultContent":"0" },  
                     { "data": "volume_satuan", "className":"text-center", "defaultContent":"0" },  
                     { "data": "unit_satuan", "className":"text-center", "defaultContent":"-" }, 
+                    { "data": "jenis_dana", "className":"text-center", "defaultContent":"-" },  
+                    { "data": "sub_jenis_dana", "className":"text-center", "defaultContent":"-" },  
                 ],
                 "rowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull, oSettings) {
                     let info = dtTable.page.info();
@@ -165,7 +181,7 @@
                     let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
 
                     $("td:eq(0)", nRow).html(index);
-                    $("td:eq(15)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
+                    $("td:eq(14)", nRow).html(separateNumberIndo(aData["jumlah_anggaran"]));
 
                     return nRow;
                 },

resources/views/realisasi_pendapatan/create.blade.php

@@ -1,7 +1,7 @@
 @php
     $siteBreadcumb = [
-        ["url"=>"/dbh/realisasi-pendapatan","label"=>$siteTitle],
+        ["url"=>"/realisasi-pendapatan","label"=>$siteTitle],
-        ["url"=>"/dbh/realisasi-pendapatan/create","label"=>$sitesubTitle]
+        ["url"=>"/realisasi-pendapatan/create","label"=>$sitesubTitle]
     ];   
 @endphp
 
@@ -13,12 +13,12 @@
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/dbh/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
                 {{-- @endif --}}
             </div>
         </div>
     @stop
-    <form id="frmSalurdana" action="{{ url('/dbh/realisasi-pendapatan') }}" method="POST" autocomplete="off">
+    <form id="frmSalurdana" action="{{ url('/realisasi-pendapatan') }}" method="POST" autocomplete="off">
         @csrf
         @include('realisasi_pendapatan.form')
 @endsection

resources/views/realisasi_pendapatan/edit.blade.php

@@ -1,7 +1,7 @@
 @php
     $siteBreadcumb = [
-        ["url"=>"/dbh/realisasi-pendapatan","label"=>$siteTitle],
+        ["url"=>"/realisasi-pendapatan","label"=>$siteTitle],
-        ["url"=>"/dbh/realisasi-pendapatan/$realisasi_pendapatan->id/edit","label"=>$sitesubTitle]
+        ["url"=>"/realisasi-pendapatan/$realisasi_pendapatan->id/edit","label"=>$sitesubTitle]
     ];   
 @endphp
 
@@ -13,12 +13,12 @@
             <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
             <div class="card-tools">
                 {{-- @if(auth()->user()->can('Tambah SKPP')) --}}
-                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/dbh/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+                    <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
                 {{-- @endif --}}
             </div>
         </div>
     @stop
-    <form id="frmSalurdana" action="{{ url('/dbh/realisasi-pendapatan/'.$realisasi_pendapatan->id) }}" method="POST" autocomplete="off">
+    <form id="frmSalurdana" action="{{ url('/realisasi-pendapatan/'.$realisasi_pendapatan->id) }}" method="POST" autocomplete="off">
         @csrf
         @include('realisasi_pendapatan.form')
         @method('PUT')

resources/views/realisasi_pendapatan/form.blade.php

@@ -132,7 +132,7 @@
     <script type="text/javascript">
         var showRinciDBH = (id)=>{
             $.ajax({
-                url: '/dbh/realisasi-pendapatan/rinci-dbh?idSPS='+id,
+                url: '/realisasi-pendapatan/rinci-dbh?idSPS='+id,
                 dataType: 'json',
                 success: function (data) {
                     for(let x=0;x<=11;x++){

resources/views/realisasi_pendapatan/index.blade.php

@@ -101,7 +101,7 @@
                 "ordering": false,
                 "autoWidth": false,
                 "ajax": {
-                    url: "/dbh/realisasi-pendapatan/datatable",
+                    url: "/realisasi-pendapatan/datatable",
                     type: "POST",
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -136,7 +136,7 @@
                     let info = dtTable.page.info();
                     let numStart = info.page;
                     let index = (numStart * dtTable.page.len()) + iDisplayIndex + 1;
-                    let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"<a class='btn btn-default btn-sm ml-1' href='/dbh/realisasi-pendapatan/" + aData["id"] + "/edit' title='Ubah'><i class='fa fa-edit'></i></a>":"";
+                    let btnEdit = {{ !empty(auth()->user()->can('Update DBH Realisasi Pendapatan'))?auth()->user()->can('Update DBH Realisasi Pendapatan'):"false" }} ?"<a class='btn btn-default btn-sm ml-1' href='/realisasi-pendapatan/" + aData["id"] + "/edit' title='Ubah'><i class='fa fa-edit'></i></a>":"";
                     let btnDelete = {{ !empty(auth()->user()->can('Delete DBH Realisasi Pendapatan'))?auth()->user()->can('Delete DBH Realisasi Pendapatan'):"false" }} ?"<button type='submit' class='btn btn-default btn-sm ml-1' title='Hapus'><i class='fa fa-trash'></i></button>":"";
                     $("td:eq(0)", nRow).html(index);
                     $("td:eq(2)", nRow).html(separateNumberIndo(aData["simtrad4_kotor"]));
@@ -145,9 +145,9 @@
                     $("td:eq(6)", nRow).html(setIndoDateOracle(aData["simtrad4_tgl_sp2d_bun"]));
                     $("td:eq(8)", nRow).html(setIndoDateOracle(aData["rkud_tgl"]));
                     $("td:eq(9)", nRow).html(
-                        "<form class='form-delete' action='/dbh/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
+                        "<form class='form-delete' action='/realisasi-pendapatan/"+aData['id']+"' method='POST'>"+
                             "<input type='hidden' name='_token' id='csrf-token' value='{{ Session::token() }}' /><input type='hidden' name='_method' value='DELETE'>"+
-                            "<a class='btn btn-default btn-sm' href='/dbh/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-bullseye'></i></a>"+    
+                            "<a class='btn btn-default btn-sm' href='/realisasi-pendapatan/"+aData['id']+"' title='Lihat'><i class='fa fa-bullseye'></i></a>"+    
                             btnEdit + btnDelete + "</form>");
 
                     return nRow;

resources/views/realisasi_pendapatan/show.blade.php

@@ -14,7 +14,7 @@
     <div class="card-header">
         <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> {{ $sitesubTitle }}</h2>
         <div class="card-tools">
-            <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/dbh/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
+            <button class="btn btn-sm btn-default" onclick="location.href='{{ url('/realisasi-pendapatan') }}'"><i class="fa fa-arrow-left"></i>  Kembali</button>
         </div>
     </div>
     <div id="detail_realisasi_pendapatan" class="card-body">
@@ -26,7 +26,7 @@
         <h2 class="card-title"><i class="fa fa-th-list mr-2"></i> STS</h2>
     </div>
     <div class="card-body">
-        <form id="frmrealisasipendapatan" action="{{ url("/dbh/realisasi-pendapatan/$realisasi_pendapatan->id/sts") }}" method="POST" autocomplete="off">
+        <form id="frmrealisasipendapatan" action="{{ url("/realisasi-pendapatan/$realisasi_pendapatan->id/sts") }}" method="POST" autocomplete="off">
             @csrf
             <div class="form-group row">
                 <label class="col-form-label col-md-2 col-sm-2 label-align" for="rkud_no_sts">No. STS</label>

routes/web.php

@@ -33,15 +33,15 @@ Route::group(['middleware' => 'auth'], function () {
         Route::resource('permissions', PermissionsController::class);
     });
 
-    //Route::resource('jadwal-salurdana', JadwalSalurdanaController::class);
+    // JADWAL SALUR ================================================
     Route::group(['prefix' => 'jadwal-salurdana'], function () {
-        Route::get('/{typeJadwal}', [JadwalSalurdanaController::class,'index_cht_dak']);
+        Route::get('/{typeDana}', [JadwalSalurdanaController::class,'index_cht_dak']);
-        Route::post('/{typeJadwal}/datatable', [JadwalSalurdanaController::class,'datatable_cht_dak']);
+        Route::post('/{typeDana}/datatable', [JadwalSalurdanaController::class,'datatable_cht_dak']);
         Route::get('/', [JadwalSalurdanaController::class,'index']);
         Route::post('/datatable', [JadwalSalurdanaController::class,'datatable']);
     });
    
-    Route::group(['prefix' => 'dbh'], function () {
+    // PENDAPATAN ==================================================
     Route::group(['prefix' => 'realisasi-pendapatan'], function () {
         Route::post('/datatable', [RealisasiPendapatanController::class,'datatable']);
         Route::post('/{realisasiId}/sts', [RealisasiPendapatanController::class,'sts']);
@@ -49,10 +49,13 @@ Route::group(['middleware' => 'auth'], function () {
     });
     Route::resource('realisasi-pendapatan', RealisasiPendapatanController::class);
 
-        Route::get('upload-realisasi-belanja', [RealisasiBelanjaController::class,'upload']);
+    // BELANJA =====================================================
-        Route::post('upload-realisasi-belanja', [RealisasiBelanjaController::class,'upload']);
+    Route::group(['prefix' => 'upload-realisasi-belanja'], function () {
-        Route::post('upload-realisasi-belanja/datatable', [RealisasiBelanjaController::class,'uploadDatatable']);
+        Route::get('/{typeDana}', [RealisasiBelanjaController::class,'upload']);
-        Route::get('upload-realisasi-belanja/upload', [RealisasiBelanjaController::class,'uploadValidate']);
+        Route::post('/{typeDana}', [RealisasiBelanjaController::class,'upload']);
+        Route::post('/{typeDana}/datatable', [RealisasiBelanjaController::class,'uploadDatatable']);
+        Route::get('/{typeDana}/upload', [RealisasiBelanjaController::class,'uploadValidate']);
+    });
 
     Route::group(['prefix' => 'realisasi-belanja'], function () {
         Route::post('/datatable', [RealisasiBelanjaController::class,'datatable']);
@@ -64,7 +67,6 @@ Route::group(['middleware' => 'auth'], function () {
         Route::delete('/delete-detail/{id}', [RealisasiBelanjaController::class,'deleteDetail']);
     });
     Route::resource('realisasi-belanja', RealisasiBelanjaController::class);
-    });
     
     Route::get('home', [HomeController::class, 'index'])->name('home');
     Route::get('skpd-search', [ItemSearchController::class,'skpd']);