Merge branch 'staging' into feature/dashboard-laporan

This commit is contained in:
majid
2025-06-20 09:17:00 +07:00
6 changed files with 596 additions and 11 deletions

View File

@@ -673,14 +673,17 @@ 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');
Breadcrumbs::for('noc.pembayaran', function (BreadcrumbTrail $trail) {
$trail->push('NOC Pembayaran', route('noc.pembayaran.index'));
});
Breadcrumbs::for('noc.penyelesaian', function (BreadcrumbTrail $trail) {
$trail->push('NOC Penyelesaian', route('noc.penyelesaian.index'));
});
Breadcrumbs::for('noc.edit', function (BreadcrumbTrail $trail) {
$trail->parent('noc');
$trail->push('Proses Memo Penyelesaian NOC');
$trail->push('Proses NOC');
});
Breadcrumbs::for('laporan-external', function (BreadcrumbTrail $trail) {

View File

@@ -655,9 +655,14 @@ Route::middleware(['auth'])->group(function () {
Route::get('noc/datatables', [NocController::class, 'dataForDatatables'])
->name('noc.datatables');
Route::get('noc/penyelesaian', [NocController::class, 'show'])->name('noc.penyelesaian');
Route::post('noc/penyelesaian', [NocController::class, 'penyelesaian'])->name('noc.store.penyelesaian');
Route::get('noc/datatables/pembayaran', [NocController::class, 'dataForDatatablesPembayaran'])
->name('noc.datatables.pembayaran');
Route::get('noc/datatables/penyelesaian', [NocController::class, 'dataForDatatablesPenyelesaian'])
->name('noc.datatables.penyelesaian');
Route::get('noc/pembayaran', [NocController::class, 'pembayaran'])->name('noc.pembayaran.index');
Route::get('noc/penyelesaian', [NocController::class, 'penyelesaian'])->name('noc.penyelesaian.index');
Route::post('noc/penyelesaian', [NocController::class, 'penyelesaian'])->name('noc.store.penyelesaian');
Route::resource('noc', NocController::class);