Merge remote-tracking branch 'origin/staging' into feature/senior-officer

# Conflicts: # app/Http/Controllers/PermohonanController.php # routes/breadcrumbs.php # routes/web.php
2024-09-19 10:47:39 +07:00
parent f679b7ea74 491e206229
commit 0506cfbcd4
22 changed files with 1477 additions and 434 deletions
--- a/module.json
+++ b/module.json
@@ -47,7 +47,7 @@
            },
            {
                "title": "Authorization",
-                "path": "",
+                "path": "authorization",
                "icon": "ki-filled ki-some-files text-lg",
                "classes": "",
                "attributes": [],
@@ -123,17 +123,9 @@
                        "permission": "",
                        "roles": []
                    },
-                    {
-                        "title": "Jenis Jaminan",
-                        "path": "basicdata.jenis-jaminan",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": []
-                    },
                    {
                        "title": "Jenis Aset",
-                        "path": "basicdata.jenis-aset",
+                        "path": "basicdata.jenis-jaminan",
                        "classes": "",
                        "attributes": [],
                        "permission": "",