diff --git a/app/Http/Controllers/Admin/MstJenisBelanjaController.php b/app/Http/Controllers/Admin/MstJenisBelanjaController.php index 6898537..46e48bf 100644 --- a/app/Http/Controllers/Admin/MstJenisBelanjaController.php +++ b/app/Http/Controllers/Admin/MstJenisBelanjaController.php @@ -39,11 +39,13 @@ class MstJenisBelanjaController extends Controller public function store(Request $request) { $request->validate([ + 'kode' => 'required', 'name' => 'required', ]); $req = $request->all(); MstJenisBelanja::where("name", $req["name"])->delete(); + $data["kode"] = $req["kode"]; $data["name"] = $req["name"]; $data["description"] = $req["description"]; MstJenisBelanja::create($data); @@ -84,10 +86,12 @@ class MstJenisBelanjaController extends Controller public function update(Request $request, MstJenisBelanja $MstJenisBelanja) { $request->validate([ + 'kode' => 'required', 'name' => 'required', ]); $req = $request->all(); + $data["kode"] = $req["kdde"]; $data["name"] = $req["name"]; $data["description"] = $req["description"]; $MstJenisBelanja->update($req); @@ -110,7 +114,7 @@ class MstJenisBelanjaController extends Controller $offset = $post["start"]; $limit = $post["length"]; $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):""; - $select = DB::raw("ID,NAME,DESCRIPTION"); + $select = DB::raw("ID,KODE,NAME,DESCRIPTION"); $sqlstr = MstJenisBelanja::select($select); $dataTotal = $sqlstr->count(); $data = $sqlstr->orderBy("ID"); diff --git a/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php b/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php index 365dbd3..345ce7a 100644 --- a/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php +++ b/app/Http/Controllers/Admin/MstSubJenisBelanjaController.php @@ -32,6 +32,7 @@ class MstSubJenisBelanjaController extends Controller public function store(Request $request) { $request->validate([ + 'kode' => 'required', 'name' => 'required', 'id_jenis_belanja' => 'required' ]); @@ -39,6 +40,7 @@ class MstSubJenisBelanjaController extends Controller $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["kode"] = $req["kode"]; $data["name"] = $req["name"]; $data["description"] = $req["description"]; MstSubJenisBelanja::create($data); @@ -59,12 +61,14 @@ class MstSubJenisBelanjaController extends Controller public function update(Request $request, MstSubJenisBelanja $MstSubJenisBelanja) { $request->validate([ + 'kode' => 'required', 'name' => 'required', 'id_jenis_belanja' => 'required' ]); - $req = $request->all(); + // var_dump($req); exit; $data["id_jenis_belanja"] = $req["id_jenis_belanja"]; + $data["kode"] = $req["kode"]; $data["name"] = $req["name"]; $data["description"] = $req["description"]; $MstSubJenisBelanja->update($req); @@ -84,7 +88,7 @@ class MstSubJenisBelanjaController extends Controller $offset = $post["start"]; $limit = $post["length"]; $src = isset($post["search"]["value"]) ? strtolower($post["search"]["value"]):""; - $select = DB::raw("ID,NAME,DESCRIPTION"); + $select = DB::raw("ID,KODE,NAME,DESCRIPTION"); $sqlstr = MstSubJenisBelanja::select($select)->where("id_jenis_belanja", $id); $dataTotal = $sqlstr->count(); $data = $sqlstr->orderBy("ID"); diff --git a/app/Models/MstJenisBelanja.php b/app/Models/MstJenisBelanja.php index cb7f1cc..2e80b92 100644 --- a/app/Models/MstJenisBelanja.php +++ b/app/Models/MstJenisBelanja.php @@ -12,6 +12,7 @@ class MstJenisBelanja extends Eloquent protected $connection = 'Samasa'; protected $table = 'SAMASA.MST_JENIS_BELANJA'; protected $fillable = [ + "kode", "name", "description", ]; diff --git a/app/Models/MstSubJenisBelanja.php b/app/Models/MstSubJenisBelanja.php index 1f0540e..2ac82de 100644 --- a/app/Models/MstSubJenisBelanja.php +++ b/app/Models/MstSubJenisBelanja.php @@ -12,6 +12,7 @@ class MstSubJenisBelanja extends Eloquent protected $connection = 'Samasa'; protected $table = 'SAMASA.MST_SUB_JENIS_BELANJA'; protected $fillable = [ + "kode", "id_jenis_belanja", "name", "description", 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 512f59f..72e1856 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 @@ -15,6 +15,7 @@ class CreateMstJenisbelanjaTable extends Migration { Schema::create('mst_jenis_belanja', function (Blueprint $table) { $table->id(); + $table->string('kode', 20); $table->string('name', 300); $table->string('description'); $table->timestamps(); diff --git a/database/migrations/2022_08_24_143614_create_mst_sub_jenis_belanja_table.php b/database/migrations/2022_08_24_143614_create_mst_sub_jenis_belanja_table.php index 56f7222..a925bc1 100644 --- a/database/migrations/2022_08_24_143614_create_mst_sub_jenis_belanja_table.php +++ b/database/migrations/2022_08_24_143614_create_mst_sub_jenis_belanja_table.php @@ -15,6 +15,7 @@ class CreateMstSubJenisBelanjaTable extends Migration { Schema::create('mst_sub_jenis_belanja', function (Blueprint $table) { $table->id(); + $table->string('kode', 20); $table->integer('id_jenis_belanja'); $table->string('name',300); $table->string('description'); diff --git a/resources/views/admin/mst_jenis_belanja/create.blade.php b/resources/views/admin/mst_jenis_belanja/create.blade.php index 8426c68..b3b62c3 100644 --- a/resources/views/admin/mst_jenis_belanja/create.blade.php +++ b/resources/views/admin/mst_jenis_belanja/create.blade.php @@ -23,6 +23,12 @@ @csrf
+
+
+ Kode + +
+
Nama diff --git a/resources/views/admin/mst_jenis_belanja/edit.blade.php b/resources/views/admin/mst_jenis_belanja/edit.blade.php index d3e2e7a..0147340 100644 --- a/resources/views/admin/mst_jenis_belanja/edit.blade.php +++ b/resources/views/admin/mst_jenis_belanja/edit.blade.php @@ -23,6 +23,12 @@ @csrf @method('PUT')
+
+
+ Kode + +
+
Nama diff --git a/resources/views/admin/mst_jenis_belanja/index.blade.php b/resources/views/admin/mst_jenis_belanja/index.blade.php index b572088..d646a97 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 @@ No + Kode Nama Deskripsi Action @@ -78,6 +79,7 @@ "paging": true, // Table pagination "columns": [ { "data": null}, + { "data": "kode", "className":"text-center" }, { "data": "name", "className":"text-left" }, { "data": "description", "className":"text-left" }, { "data": null, "className":"text-center" }, @@ -89,7 +91,7 @@ let checked = aData["is_lock_upload"] == 1 ? "checked":""; $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(` + $("td:eq(4)", nRow).html(`
@csrf @method('DELETE') diff --git a/resources/views/admin/mst_jenis_belanja/show.blade.php b/resources/views/admin/mst_jenis_belanja/show.blade.php index e9418fe..03b70cd 100644 --- a/resources/views/admin/mst_jenis_belanja/show.blade.php +++ b/resources/views/admin/mst_jenis_belanja/show.blade.php @@ -28,9 +28,13 @@ @csrf
+
+ Kode: + +
Nama: - +
Deskripsi @@ -53,6 +57,7 @@ No + Kode Nama Deskripsi Action @@ -103,6 +108,7 @@ "paging": true, // Table pagination "columns": [ { "data": null}, + { "data": "kode", "className":"text-center" }, { "data": "name", "className":"text-left" }, { "data": "description", "className":"text-left" }, { "data": null, "className":"text-center" }, @@ -114,7 +120,7 @@ let checked = aData["is_lock_upload"] == 1 ? "checked":""; $("td:eq(0)", nRow).html(index); - $("td:eq(3)", nRow).html(` + $("td:eq(4)", nRow).html(` @csrf @method('DELETE') diff --git a/resources/views/admin/mst_sub_jenis_belanja/create.blade.php b/resources/views/admin/mst_sub_jenis_belanja/create.blade.php index f22357b..7f75813 100644 --- a/resources/views/admin/mst_sub_jenis_belanja/create.blade.php +++ b/resources/views/admin/mst_sub_jenis_belanja/create.blade.php @@ -23,6 +23,12 @@ @csrf
+
+
+ Kode + +
+
Nama diff --git a/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php b/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php index 7353d9f..2691937 100644 --- a/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php +++ b/resources/views/admin/mst_sub_jenis_belanja/edit.blade.php @@ -14,7 +14,7 @@
@php echo $sitesubTitle; @endphp
@@ -26,7 +26,13 @@
Nama - + +
+
+
+
+ Nama +