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

# Conflicts:
#	app/Http/Controllers/PermohonanController.php
#	routes/breadcrumbs.php
#	routes/web.php
This commit is contained in:
Daeng Deni Mardaeni
2024-09-19 10:47:39 +07:00
22 changed files with 1477 additions and 434 deletions

View File

@@ -39,17 +39,17 @@
Breadcrumbs::for('basicdata.jenis-jaminan', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Jenis Jaminan', route('basicdata.jenis-jaminan.index'));
$trail->push('Jenis Aset', route('basicdata.jenis-jaminan.index'));
});
Breadcrumbs::for('basicdata.jenis-jaminan.create', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata.jenis-jaminan');
$trail->push('Tambah Jenis Jaminan', route('basicdata.jenis-jaminan.create'));
$trail->push('Tambah Jenis Aset', route('basicdata.jenis-jaminan.create'));
});
Breadcrumbs::for('basicdata.jenis-jaminan.edit', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata.jenis-jaminan');
$trail->push('Edit Jenis Jaminan');
$trail->push('Edit Jenis Aset');
});
Breadcrumbs::for('basicdata.tujuan-penilaian', function (BreadcrumbTrail $trail) {
@@ -67,21 +67,6 @@
$trail->push('Edit Tujuan Penilaian');
});
Breadcrumbs::for('basicdata.jenis-aset', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Jenis Aset', route('basicdata.jenis-aset.index'));
});
Breadcrumbs::for('basicdata.jenis-aset.create', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata.jenis-aset');
$trail->push('Tambah Jenis Aset', route('basicdata.jenis-aset.create'));
});
Breadcrumbs::for('basicdata.jenis-aset.edit', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata.jenis-aset');
$trail->push('Edit Jenis Aset');
});
Breadcrumbs::for('basicdata.jenis-dokumen', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Jenis Dokumen', route('basicdata.jenis-dokumen.index'));
@@ -267,7 +252,6 @@
$trail->push('Data Permohonan');
});
Breadcrumbs::for('basicdata.region', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Region', route('basicdata.region.index'));
@@ -281,7 +265,6 @@
$trail->push('Edit Region');
});
Breadcrumbs::for('basicdata.teams', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Team', route('basicdata.teams.index'));
@@ -320,3 +303,13 @@
$trail->parent('penilaian');
$trail->push('Buat Penilaian');
});
Breadcrumbs::for('authorization.index', function (BreadcrumbTrail $trail) {
$trail->push('Permohonan', route('authorization.index'));
});
Breadcrumbs::for('authorization.show', function (BreadcrumbTrail $trail) {
$trail->parent('authorization.index');
$trail->push('Detail Permohonan');
});