daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/tender' into staging

Browse Source 
# Conflicts:
#	routes/breadcrumbs.php
This commit is contained in:
Daeng Deni Mardaeni
2024-10-08 17:09:46 +07:00
parent 77f46186bd d1be0c3aa9
commit 1b931f307a
9 changed files with 650 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
routes/web.php
View File

@@ -410,17 +410,17 @@ Route::middleware(['auth'])->group(function () {
Route::name('tender.')->prefix('tender')->group(function () {
// Penawaran
Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
Route::get('penawaran/{id}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
Route::get('penawaran/{id}/create', [TenderController::class, 'penawaran_create'])->name(
Route::get('penawaran/{noreg}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
Route::get('penawaran/{noreg}/create', [TenderController::class, 'penawaran_create'])->name(
'penawaran.createPenawaran',
);
Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name(
Route::post('penawaran/{noreg}/store', [TenderController::class, 'penawaran_store'])->name(
'penawaran.storePenawaran',
);
Route::get('penawaran/{id}/edit', [TenderController::class, 'penawaran_edit'])->name(
Route::get('penawaran/{noreg}/edit', [TenderController::class, 'penawaran_edit'])->name(
'penawaran.editPenawaran',
);
Route::put('penawaran/{id}/update', [TenderController::class, 'penawaran_update'])->name(
Route::put('penawaran/{noreg}/update', [TenderController::class, 'penawaran_update'])->name(
'penawaran.updatePenawaran',
);
Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
@@ -430,15 +430,19 @@ Route::middleware(['auth'])->group(function () {
'penawaran.datatables',
);
// Penawaran Ulang
Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
'penawaran.ulang.index',
);
Route::get('penawaran/ulang/{noreg}/show', [TenderController::class, 'penawaran_ulang_show'])->name('penawaran.ulang.show');
Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
'penawaran.ulang.datatables',
);
// Proses Penawaran
Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name(
'proses_penawaran.index',
);
// Penawaran Ulang
Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
'penawaran_ulang.index',
);
});
Route::name('penilaian.')->prefix('penilaian')->group(function () {