Update and Bugs Fix
This commit is contained in:
@@ -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()
|
||||
// ]);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
]);
|
||||
|
||||
|
||||
@@ -15,5 +15,6 @@ class MstJenisBelanja extends Eloquent
|
||||
"kode",
|
||||
"name",
|
||||
"description",
|
||||
"grup"
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user