Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

This commit is contained in:
Andy Chaerudin
2024-12-23 18:39:55 +07:00
37 changed files with 2610 additions and 1186 deletions

View File

@@ -298,6 +298,20 @@
$trail->push('Data Permohonan');
});
Breadcrumbs::for('permohonan.show-pembatalan', function (BreadcrumbTrail $trail) {
$trail->parent('permohonan.index');
$trail->push('Show Pembatalan Permohonan');
});
Breadcrumbs::for('pembatalan', function (BreadcrumbTrail $trail) {
$trail->push('Pembatalan', route('pembatalan.index'));
});
Breadcrumbs::for('pembatalan.edit', function (BreadcrumbTrail $trail) {
$trail->parent('pembatalan');
$trail->push('Show Pembatalan');
});
Breadcrumbs::for('basicdata.region', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('Region', route('basicdata.region.index'));

View File

@@ -18,6 +18,7 @@ use Modules\Lpj\Http\Controllers\KJPPController;
use Modules\Lpj\Http\Controllers\LaporanController;
use Modules\Lpj\Http\Controllers\NilaiPlafondController;
use Modules\Lpj\Http\Controllers\NocController;
use Modules\Lpj\Http\Controllers\PembatalanController;
use Modules\Lpj\Http\Controllers\PemilikJaminanController;
use Modules\Lpj\Http\Controllers\PenilaianController;
use Modules\Lpj\Http\Controllers\PenilaiController;
@@ -367,9 +368,16 @@ Route::middleware(['auth'])->group(function () {
});
Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
Route::get('permohonan/{id}/pembatalan', [PermohonanController::class, 'showPembatalan'])->name('permohonan.show-pembatalan');
Route::post('permohonan/pembatalan', [PermohonanController::class, 'pembatalan'])->name('permohonan.pembatalan');
Route::resource('permohonan', PermohonanController::class);
Route::name('pembatalan.')->prefix('pembatalan')->group(function () {
Route::get('datatables', [PembatalanController::class, 'dataForDatatables'])->name('datatables');
});
Route::resource('pembatalan', PembatalanController::class);
Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
'authorization.datatables',
@@ -539,6 +547,7 @@ Route::middleware(['auth'])->group(function () {
Route::get('lampiran/{id}', [PenilaiController::class, 'lampiran'])->name('lampiran');
Route::get('export/kertas-kerja', [PenilaiController::class, 'export_kertas_kerja'])->name('export.kertas-kerja');
Route::get('print-out', [PenilaiController::class, 'print_out'])->name('print-out');
Route::post('import/kertas-kerja', [PenilaiController::class, 'import_kertas_kerja'])->name('import.kertas-kerja');