Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-12-20 13:33:29 +07:00
21 changed files with 884 additions and 294 deletions

View File

@@ -532,7 +532,7 @@
Breadcrumbs::for('otorisator.show', function (BreadcrumbTrail $trail, $id, $type) {
$trail->push("Detail $type", route('otorisator.show', ['id' => $id, 'type' => $type]));
});
Breadcrumbs::for('laporan', function (BreadcrumbTrail $trail) {
$trail->push('Laporan', route('laporan.sederhana.index'));
@@ -587,5 +587,14 @@
$trail->push('Proses Persetujuan Penawaran');
});
Breadcrumbs::for('noc', function (BreadcrumbTrail $trail) {
$trail->push('NOC', route('noc.index'));
});
Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) {
$trail->parent('noc');
$trail->push('Proses NOC');
});
// add andy
require __DIR__ . '/breadcrumbs_registrasi.php';

View File

@@ -17,7 +17,8 @@ use Modules\Lpj\Http\Controllers\JenisPenilaianController;
use Modules\Lpj\Http\Controllers\KJPPController;
use Modules\Lpj\Http\Controllers\LaporanController;
use Modules\Lpj\Http\Controllers\NilaiPlafondController;
use Modules\Lpj\Http\Controllers\PemilikJaminanController;
use Modules\Lpj\Http\Controllers\NocController;
use Modules\Lpj\Http\Controllers\PemilikJaminanController;
use Modules\Lpj\Http\Controllers\PenilaianController;
use Modules\Lpj\Http\Controllers\PenilaiController;
use Modules\Lpj\Http\Controllers\PermohonanController;
@@ -561,6 +562,11 @@ Route::middleware(['auth'])->group(function () {
->name('persetujuan-penawaran.datatables');
Route::resource('persetujuan-penawaran', PersetujuanPenawaranController::class);
Route::get('noc/datatables', [NocController::class, 'dataForDatatables'])
->name('noc.datatables');
Route::resource('noc', NocController::class);
});
require __DIR__ . '/registrasi.php';