diff --git a/app/Http/Controllers/Admin/MstJenisBelanjaController.php b/app/Http/Controllers/Admin/MstJenisBelanjaController.php
index 46e48bf..490e4b0 100644
--- a/app/Http/Controllers/Admin/MstJenisBelanjaController.php
+++ b/app/Http/Controllers/Admin/MstJenisBelanjaController.php
@@ -30,21 +30,17 @@ class MstJenisBelanjaController extends Controller
         return view('admin.mst_jenis_belanja.create');
     }
 
-    // public function create_sub(MstJenisBelanja $MstJenisBelanja)
-    // {
-    //     $this->setSubtitle("Tambah Data Sub Jenis Belanja [<strong>".$MstJenisBelanja->name."</strong>] ");
-    //     return view('admin.mst_jenis_belanja.create_sub',compact("MstJenisBelanja"));
-    // }
-
     public function store(Request $request)
     {
         $request->validate([
-            'kode' => 'required',
+            'grup' => 'required',
+            //'kode' => 'required',
             'name' => 'required',
         ]);
 
         $req = $request->all();
-        MstJenisBelanja::where("name", $req["name"])->delete();
+        MstJenisBelanja::where("name", $req["name"])->where("grup", $req["grup"])->delete();
+        $data["grup"] = $req["grup"];
         $data["kode"] = $req["kode"];
         $data["name"] = $req["name"];
         $data["description"] = $req["description"];
@@ -53,23 +49,6 @@ class MstJenisBelanjaController extends Controller
         return redirect("/admin/MstJenisBelanja")->with('success','Jenis Belanja berhasil dibuat.');
     }
 
-    // public function store_sub(Request $request)
-    // {
-    //     $request->validate([
-    //         'name' => 'required',
-    //         'id_jenis_belanja' => 'required'
-    //     ]);
-
-    //     $req = $request->all();
-    //     MstSubJenisBelanja::where("name", $req["name"])->where("id_jenis_belanja", $req["id_jenis_belanja"])->delete();
-    //     $data["id_jenis_belanja"] = $req["id_jenis_belanja"];
-    //     $data["name"] = $req["name"];
-    //     $data["description"] = $req["description"];
-    //     MstSubJenisBelanja::create($data);
-     
-    //     return redirect("/admin/MstJenisBelanja/".$data["id_jenis_belanja"])->with('success','Sub Jenis Belanja berhasil dibuat.');
-    // }
-
     public function show(MstJenisBelanja $MstJenisBelanja)
     {
         $SubJenisBelanja = MstSubJenisBelanja::where("id_jenis_belanja",$MstJenisBelanja->id)->get();
@@ -86,12 +65,14 @@ class MstJenisBelanjaController extends Controller
     public function update(Request $request, MstJenisBelanja $MstJenisBelanja)
     {
         $request->validate([
-            'kode' => 'required',
+            'grup' => 'required',
+            //'kode' => 'required',
             'name' => 'required',
         ]);
 
         $req = $request->all();
-        $data["kode"] = $req["kdde"];
+        $data["grup"] = $req["grup"];
+        $data["kode"] = $req["kode"];
         $data["name"] = $req["name"];
         $data["description"] = $req["description"];
         $MstJenisBelanja->update($req);
@@ -114,7 +95,7 @@ class MstJenisBelanjaController extends Controller
         $offset = $post["start"];
         $limit = $post["length"];
         $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
-        $select = DB::raw("ID,KODE,NAME,DESCRIPTION");
+        $select = DB::raw("ID,GRUP,KODE,NAME,DESCRIPTION");
         $sqlstr = MstJenisBelanja::select($select);
         $dataTotal = $sqlstr->count();
         $data = $sqlstr->orderBy("ID");
@@ -130,26 +111,4 @@ class MstJenisBelanjaController extends Controller
         ]);
     }
 
-    // public function datatableSubJenisBelanja(Request $request, $id)
-    // {
-    //     $post = $request->all();
-    //     $offset = $post["start"];
-    //     $limit = $post["length"];
-    //     $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):"";
-    //     $select = DB::raw("ID,NAME,DESCRIPTION");
-    //     $sqlstr = MstSubJenisBelanja::select($select)->where("id_jenis_belanja", $id);
-    //     $dataTotal = $sqlstr->count();
-    //     $data = $sqlstr->orderBy("ID");
-    //     if (!empty($src)){
-    //         $data->whereRaw(" ( lower(NAME) like '%$src%' OR lower(DESCRIPTION) like '%$src%' ) ");
-    //     }
-    //     $dataFilter = $data->count();
-
-    //     return response()->json([
-    //         "recordsTotal" => $dataTotal,
-    //         "recordsFiltered" => $dataFilter,
-    //         "data"=> $data->skip($offset)->take($limit)->get()
-    //     ]);
-    // }
-
 }
diff --git a/app/Http/Controllers/ItemSearchController.php b/app/Http/Controllers/ItemSearchController.php
index 6466265..c74a6ab 100644
--- a/app/Http/Controllers/ItemSearchController.php
+++ b/app/Http/Controllers/ItemSearchController.php
@@ -192,13 +192,15 @@ class ItemSearchController extends Controller
     {
     	$sk = [];
         $select = DB::raw("ID, NAME");
+        $grup = $request->grup;
         if($request->has('q')){
             $search = $request->q;
             $sk = MstJenisBelanja::select($select)
+                    ->where('GRUP',$grup)
                     ->where('NAME', 'LIKE', "%$search%")
                     ->get();
         }else{
-            $sk = MstJenisBelanja::select($select)->get();
+            $sk = MstJenisBelanja::select($select)->where('GRUP',$grup)->get();
         }
         return response()->json($sk);
     }
diff --git a/app/Http/Controllers/RealisasiBelanjaController.php b/app/Http/Controllers/RealisasiBelanjaController.php
index 4885c86..c9b07aa 100644
--- a/app/Http/Controllers/RealisasiBelanjaController.php
+++ b/app/Http/Controllers/RealisasiBelanjaController.php
@@ -102,11 +102,9 @@ class RealisasiBelanjaController extends Controller
             "jenis_dana"=>"required",
             "sub_jenis_dana"=>"required",
             "jenis"=>"required",
-            "sub_jenis"=>"required",
             "rsk"=>"required",
             "vol"=>"required",
             "unit"=>"required",
-            "jml_rencana_kontrak"=>"required",
             "id_sps"=>"required",
         ]);
 
@@ -118,7 +116,7 @@ class RealisasiBelanjaController extends Controller
             $input = [
                 "tahun_anggaran"=>getTA(),
                 "jenis_belanja"=>$req["jenis"],
-                "sub_jenis_belanja"=>$req["sub_jenis"],
+                "sub_jenis_belanja"=>isset($req["sub_jenis"])?$req["sub_jenis"]:0,
                 "kode_program"=>$VwDpaRsk["c_program"],
                 "nama_program"=>$VwDpaRsk["n_program"],
                 "kode_skpd"=>$VwDpaRsk["c_opd"],
@@ -132,7 +130,7 @@ class RealisasiBelanjaController extends Controller
                 "jumlah_anggaran"=>$VwDpaRsk["v_angg_tapd"],
                 "volume_satuan"=>$req["vol"],
                 "unit_satuan"=>$req["unit"],
-                "jml_rencana_kontrak"=>$req["jml_rencana_kontrak"],
+                "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"=>$req["id_sps"],
@@ -167,11 +165,9 @@ class RealisasiBelanjaController extends Controller
             "jenis_dana"=>"required",
             "sub_jenis_dana"=>"required",
             "jenis"=>"required",
-            "sub_jenis"=>"required",
             "rsk"=>"required",
             "vol"=>"required",
             "unit"=>"required",
-            "jml_rencana_kontrak"=>"required",
             "id_sps"=>"required",
         ]);
 
diff --git a/app/Models/MstJenisBelanja.php b/app/Models/MstJenisBelanja.php
index 2e80b92..fdfc773 100644
--- a/app/Models/MstJenisBelanja.php
+++ b/app/Models/MstJenisBelanja.php
@@ -15,5 +15,6 @@ class MstJenisBelanja extends Eloquent
         "kode",
         "name",
         "description",
+        "grup"
     ];
 }
diff --git a/database/migrations/2022_08_24_143252_create_mst_jenis_belanja_table.php b/database/migrations/2022_08_24_143252_create_mst_jenis_belanja_table.php
index 72e1856..dd9e792 100644
--- a/database/migrations/2022_08_24_143252_create_mst_jenis_belanja_table.php
+++ b/database/migrations/2022_08_24_143252_create_mst_jenis_belanja_table.php
@@ -18,6 +18,7 @@ class CreateMstJenisbelanjaTable extends Migration
             $table->string('kode', 20);
             $table->string('name', 300);
             $table->string('description');
+            $table->enum('grup',["DBH","DAK"])->default("DBH");
             $table->timestamps();
         });
     }
diff --git a/public/js/app.js b/public/js/app.js
index a90924d..febdddc 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -295,25 +295,27 @@ $('.rsk_search').select2({
     }
 });
 
-$('.jenis_belanja_search').select2({
-  placeholder: 'Pilih Jenis Belanja',
-  ajax: {
-      url: Url+'/item-search-jenisbelanja',
-      dataType: 'json',
-      delay: 250,
-      processResults: function (data) {
-          return {
-              results: $.map(data, function (item) {
-                  return {
-                      text: item.name,
-                      id: item.id
-                  }
-              })
-          };
-      },
-      cache: true
-  }
-});
+let jenisBelanja = (grup)=>{
+  $('.jenis_belanja_search').select2({
+    placeholder: 'Pilih Jenis Belanja',
+    ajax: {
+        url: Url+'/item-search-jenisbelanja?grup='+grup,
+        dataType: 'json',
+        delay: 250,
+        processResults: function (data) {
+            return {
+                results: $.map(data, function (item) {
+                    return {
+                        text: item.name,
+                        id: item.id
+                    }
+                })
+            };
+        },
+        cache: true
+    }
+  });
+}
 
 let subJenisBelanja = (idJenisBelanja)=>{
   $('.sub_jenis_belanja_search').select2({
diff --git a/resources/views/admin/mst_jenis_belanja/create.blade.php b/resources/views/admin/mst_jenis_belanja/create.blade.php
index b3b62c3..15bbe36 100644
--- a/resources/views/admin/mst_jenis_belanja/create.blade.php
+++ b/resources/views/admin/mst_jenis_belanja/create.blade.php
@@ -23,10 +23,19 @@
         @csrf
 
         <div class="row">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+                <div class="form-group">
+                    <strong>Grup</strong>
+                    <select class="form-control" name="grup">
+                        <option value="DBH">DBH</option>
+                        <option value="DAK">DAK</option>
+                    </select>
+                </div>
+            </div>
             <div class="col-xs-12 col-sm-12 col-md-12">
                 <div class="form-group">
                     <strong>Kode</strong>
-                    <input type="text" class="form-control" name="kode" required placeholder="Input Kode">
+                    <input type="text" class="form-control" name="kode" placeholder="Input Kode">
                 </div>
             </div>
             <div class="col-xs-12 col-sm-12 col-md-12">
diff --git a/resources/views/admin/mst_jenis_belanja/edit.blade.php b/resources/views/admin/mst_jenis_belanja/edit.blade.php
index 0147340..a855fa8 100644
--- a/resources/views/admin/mst_jenis_belanja/edit.blade.php
+++ b/resources/views/admin/mst_jenis_belanja/edit.blade.php
@@ -23,10 +23,19 @@
         @csrf
         @method('PUT')
         <div class="row">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+                <div class="form-group">
+                    <strong>Grup</strong>
+                    <select class="form-control" name="grup">
+                        <option value="DBH">DBH</option>
+                        <option value="DAK">DAK</option>
+                    </select>
+                </div>
+            </div>
             <div class="col-xs-12 col-sm-12 col-md-12">
                 <div class="form-group">
                     <strong>Kode</strong>
-                    <input type="text" class="form-control" name="kode" required placeholder="Input Kode" value="{{ $MstJenisBelanja->kode }}">
+                    <input type="text" class="form-control" name="kode" placeholder="Input Kode" value="{{ $MstJenisBelanja->kode }}">
                 </div>
             </div>
             <div class="col-xs-12 col-sm-12 col-md-12">
diff --git a/resources/views/admin/mst_jenis_belanja/index.blade.php b/resources/views/admin/mst_jenis_belanja/index.blade.php
index 46ff852..c429c51 100644
--- a/resources/views/admin/mst_jenis_belanja/index.blade.php
+++ b/resources/views/admin/mst_jenis_belanja/index.blade.php
@@ -28,6 +28,7 @@
                 <tr>
                     <thead>
                         <th width="50">No</th>
+                        <th>Grup</th>
                         <th>Kode</th>
                         <th>Nama</th>
                         <th>Deskripsi</th>
@@ -79,6 +80,7 @@
                 "paging": true, // Table pagination
                 "columns": [
                     { "data": null},
+                    { "data": "grup", "className":"text-center" },
                     { "data": "kode", "className":"text-center" },
                     { "data": "name", "className":"text-left" },
                     { "data": "description", "className":"text-left" },                    
@@ -91,7 +93,7 @@
                     let checked = aData["is_lock_upload"] == 1 ? "checked":"";
 
                     $("td:eq(0)", nRow).html(index);
-                    $("td:eq(4)", nRow).html(`
+                    $("td:eq(5)", nRow).html(`
                     <form class="form-delete" action="{{ URL::to("/admin/MstJenisBelanja") }}/`+ aData["id"] +`" method="POST">   
                         @csrf
                         @method('DELETE')      
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 18781c9..9ddaa41 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -24,7 +24,7 @@
       <section class="content pt-1">
         @if ($errors->any())
           <div class="alert alert-danger">
-              <strong>Whoops!</strong> There were some problems with your input.<br><br>
+              <strong>Error: </strong> Terjadi beberapa kesalahan!<br><br>
               <ul>
                   @foreach ($errors->all() as $error)
                       <li>{{ $error }}</li>
diff --git a/resources/views/realisasi_belanja/create.blade.php b/resources/views/realisasi_belanja/create.blade.php
index c4dda7a..ba97951 100644
--- a/resources/views/realisasi_belanja/create.blade.php
+++ b/resources/views/realisasi_belanja/create.blade.php
@@ -85,7 +85,7 @@
             $("input[name=anggaran]").val("{{ separateNumberIndo($VwDpaRsk->v_angg_tapd) }}");
             $("input[name=anggaran]").attr("readonly", true);
 
-            subJenisDana($("#jenis_dana").val());
+            $('select[name=jenis_dana]').change();
 
             $(document).on("submit","#frmRealBelanja",function (e){
                 e.preventDefault();
diff --git a/resources/views/realisasi_belanja/edit.blade.php b/resources/views/realisasi_belanja/edit.blade.php
index 6228d30..49b535f 100644
--- a/resources/views/realisasi_belanja/edit.blade.php
+++ b/resources/views/realisasi_belanja/edit.blade.php
@@ -34,7 +34,8 @@
             var srcDate1 = null, srcDate2 = null;
 
             $("select[name=jenis_dana]").val("{{ $realisasi_belanja->jenis_dana }}");
-
+            $('select[name=jenis_dana]').change();
+            
             let $newOptionSubJenisDana = $("<option selected='selected'></option>").val("{{ $realisasi_belanja->sub_jenis_dana }}").text("{{ $realisasi_belanja->nama_jenis_dana }}")
             $("select[name=sub_jenis_dana]").val("{{ $realisasi_belanja->sub_jenis_dana }}");
             $("select[name=sub_jenis_dana]").append($newOptionSubJenisDana).trigger('change');
@@ -82,7 +83,7 @@
             $("input[name=vol]").val("{{ isset($realisasi_belanja->volume_satuan)?separateNumberIndo($realisasi_belanja->volume_satuan):0 }}");
             $("select[name=unit]").val("{{ $realisasi_belanja->unit_satuan }}");
             $("input[name=jml_rencana_kontrak]").val("{{ isset($realisasi_belanja->jml_rencana_kontrak)?$realisasi_belanja->jml_rencana_kontrak:0 }}");
-
+            
             subJenisDana($("#jenis_dana").val());
             subJenisBelanja($("select[name=jenis]").val());
 
diff --git a/resources/views/realisasi_belanja/form.blade.php b/resources/views/realisasi_belanja/form.blade.php
index 8c7b954..701cdd4 100644
--- a/resources/views/realisasi_belanja/form.blade.php
+++ b/resources/views/realisasi_belanja/form.blade.php
@@ -17,11 +17,11 @@
         </div>
         <div class="form-group">
             <label class="col-form-label label-align" for="jenis">Jenis Belanja</label>
-            <select name="jenis" class="form-control jenis_belanja_search" required></select>
+            <select id="jenis" name="jenis" class="form-control jenis_belanja_search" required></select>
         </div>
         <div class="form-group">
             <label class="col-form-label label-align" for="sub_jenis">Sub Jenis Belanja</label>
-            <select name="sub_jenis" class="form-control sub_jenis_belanja_search" required></select>
+            <select id="sub_jenis" name="sub_jenis" class="form-control sub_jenis_belanja_search"></select>
         </div>
         <div class="form-group">
             <label class="col-form-label label-align" for="prog">Program</label>
@@ -61,7 +61,7 @@
                 <?php } ?>
             </select>
         </div>
-        <div class="form-group">
+        <div id="div_jml_rencana_kontrak" class="form-group" style="display: none;">
             <label class="col-form-label label-align" for="sk">Jumlah Rencana Kontrak</label>
             <input type="number" class="form-control form-control-sm" name="jml_rencana_kontrak" required>
         </div>
@@ -79,7 +79,24 @@
             })
 
             $('select[name=jenis_dana]').on('change', function (e) {
+                $("#sub_jenis_dana").val('').trigger('change');
+                $("#jenis").val('').trigger('change');
+                $("#sub_jenis").val('').trigger('change');
                 subJenisDana($(this).val());
+                jenisBelanja($(this).val());
+            })
+
+            $('select[name=sub_jenis_dana]').on('select2:select', function (e) {
+                var data = e.params.data;
+                if (data.text == "Fisik")
+                {
+                    $("#div_jml_rencana_kontrak").show();
+                    $("input[name=jml_rencana_kontrak]").prop("required", true);
+                }else{
+                    $("#div_jml_rencana_kontrak").hide();
+                    $("input[name=jml_rencana_kontrak]").val(0);
+                    $("input[name=jml_rencana_kontrak]").prop("required", false);
+                }
             })
 
         });