Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-11-06 09:45:37 +07:00
17 changed files with 1427 additions and 296 deletions

View File

@@ -498,6 +498,15 @@ Breadcrumbs::for('otorisasitender.penawaran.show', function (BreadcrumbTrail $tr
$trail->push('Detail Data Otorisasi Penawaran');
});
// andy add Otorisasi Tender
// spk
Breadcrumbs::for('spk', function (BreadcrumbTrail $trail) {
$trail->push('SPK', route('spk.index'));
});
Breadcrumbs::for('spk.edit', function (BreadcrumbTrail $trail) {
$trail->parent('spk');
$trail->push('Buat SPK');
});
// spk
// andy add registrasi final
Breadcrumbs::for('registrasifinal', function (BreadcrumbTrail $trail) {
$trail->push('Registrasi Final', route('registrasifinal.index'));

View File

@@ -4,6 +4,7 @@ use Modules\Lpj\Http\Controllers\RegistrasiController;
use Modules\Lpj\Http\Controllers\ProsesPenawaranController;
use Modules\Lpj\Http\Controllers\ProsesPenawaranUlangController;
use Modules\Lpj\Http\Controllers\OtorisasiPenawaranController;
use Modules\Lpj\Http\Controllers\SpkController;
use Modules\Lpj\Http\Controllers\RegistrasiFinalController;
Route::middleware(['auth'])->group(function () {
@@ -85,6 +86,15 @@ Route::middleware(['auth'])->group(function () {
});
});
Route::controller(SpkController::class)->group(function(){
Route::get('/spk/dokumennya', 'dokumennya')->name('spk.dokumennya');
Route::get('/spk', 'index')->name('spk.index');
Route::get('/spk/datatables', 'dataForDatatables')->name('spk.datatables');
Route::get('/spk/{spk}', 'show')->name('spk.show');
Route::get('/spk/{spk}/edit', 'edit')->name('spk.edit');
Route::put('/spk/{spk}', 'update')->name('spk.update');
});
Route::controller(RegistrasiFinalController::class)->group(function(){
Route::get('/registrasifinal', 'index')->name('registrasifinal.index');
Route::get('/registrasifinal/datatables', 'dataForDatatables')->name('registrasifinal.datatables');

View File

@@ -2,7 +2,6 @@
use Illuminate\Support\Facades\Route;
use Modules\Lpj\Http\Controllers\SLAController;
use Modules\Lpj\Http\Controllers\SpkController;
use Modules\Lpj\Http\Controllers\KJPPController;
use Modules\Lpj\Http\Controllers\TeamsController;
use Modules\Lpj\Http\Controllers\RegionController;
@@ -67,7 +66,7 @@ Route::middleware(['auth'])->group(function () {
Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas');
Route::get('legalitas/{id}/{jenisJaminanId}', [DokumenJaminanController::class, 'getLegalitasJaminan'])->name('legalitas');
Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
@@ -353,18 +352,6 @@ Route::middleware(['auth'])->group(function () {
Route::get('print/{id}', [PermohonanController::class, 'print'])->name('print');
});
Route::name('spk.')->prefix('spk')->group(function () {
// Route::get('download', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
Route::get('view', [SpkController::class, 'viewSpk'])->name('spk.view');
// Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
// Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
// Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
// Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
// Route::get('export', [PermohonanController::class, 'export'])->name('export');
});
Route::resource('spk', SpkController::class);
Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
Route::resource('permohonan', PermohonanController::class);