Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-11-20 17:07:03 +07:00
42 changed files with 2515 additions and 265 deletions

View File

@@ -399,6 +399,16 @@ Breadcrumbs::for('tender.penawaran.showSuratTender', function (BreadcrumbTrail $
$trail->push('Surat Tender', route('tender.penawaran.showSuratTender', $noreg));
});
Breadcrumbs::for('tender.penawaran.suratTenderKJPP', function (BreadcrumbTrail $trail, $noreg, $id) {
$trail->parent('tender.penawaran');
$trail->push('Surat Tender KJPP', route('tender.penawaran.suratTenderKJPP', ['noreg' => $noreg, 'id' => $id]));
});
Breadcrumbs::for('tender.penawaran.showKirimEmail', function (BreadcrumbTrail $trail, $noreg) {
$trail->parent('tender.penawaran');
$trail->push('Show Kirim Email Penawaran', route('tender.penawaran.showKirimEmail', $noreg));
});
Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender');

View File

@@ -20,38 +20,48 @@ Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
// prosespenawaran
Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
$trail->push('Proses Penawaran', route('tender.prosespenawaran.index'));
});
Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Proses Penawaran');
$trail->push('Tambah Proses Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Detail Data Proses Penawaran');
$trail->push('Detail Proses Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.editulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Proses Penawaran Ulang');
$trail->push('Tambah Proses Penawaran Ulang');
});
Breadcrumbs::for('tender.prosespenawaran.createPenawaran', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.showPermohonan', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Detail Proses Penawaran');
});
// prosespenawaran
// Proses Penawaran Ulang
Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
$trail->push('Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
});
Breadcrumbs::for('tender.prosespenawaranulang.edit', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaranulang');
$trail->push('Tambah Data Proses Penawaran Ulang');
$trail->push('Tambah Proses Penawaran Ulang');
});
Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaranulang');
$trail->push('Detail Data Proses Penawaran Ulang');
$trail->push('Detail Proses Penawaran Ulang');
});
// Proses Penawaran Ulang
// Otorisasi Tender

View File

@@ -59,6 +59,12 @@ Route::middleware(['auth'])->group(function () {
Route::post('prosespenawaran/setDataUlang', 'setDataUlang')->name('prosespenawaran.setDataUlang');
Route::put('/prosespenawaran2/{prosespenawaran2}', 'updateulang')->name('prosespenawaran.updateulang');
Route::put('/prosespenawaranKJPPStatusUlang/{prosespenawaranKJPPStatusUlang}', 'updateKJPPStatusUlang')->name('prosespenawaran.updateKJPPStatusUlang');
// merger penawaran
Route::get('/prosespenawaran/{prosespenawaran}/showPermohonan', 'showPermohonan')->name('prosespenawaran.showPermohonan');
Route::get('prosespenawaran/{prosespenawaran}/createPenawaran', 'createPenawaran')->name('prosespenawaran.createPenawaran');
Route::post('prosespenawaran/{prosespenawaran}/storePenawaran', 'storePenawaran')->name('prosespenawaran.storePenawaran');
// merger penawaran
});
// Proses Penawaran Ulang

View File

@@ -398,6 +398,15 @@ Route::middleware(['auth'])->group(function () {
'penawaran.showSuratTender'
);
Route::get('penawaran/{noreg}/suratTender/downloadpdf', [TenderController::class, 'downloadSuratTender'])->name('penawaran.downloadSuratTender');
// Kirim Email Penawaran
Route::get('penawaran/{noreg}/showKirimEmail', [TenderController::class, 'showKirimEmail'])->name('penawaran.showKirimEmail');
Route::get('penawaran/{noreg}/kirimEmailAll', [TenderController::class, 'kirimEmailAll'])->name('penawaran.kirimEmailAll');
Route::get('penawaran/{noreg}/suratTenderKJPP/{id}', [TenderController::class, 'suratTenderKJPP'])->name('penawaran.suratTenderKJPP');
Route::get('penawaran/{noreg}/suratTenderKJPP/{id}/kirimEmailKJPP', [TenderController::class, 'kirimEmailKJPP'])->name('penawaran.kirimEmailKJPP');
Route::get('penawaran/suratTenderShow/{noreg}/datatables', [TenderController::class, 'dataTablesShowKirimSurat'])->name('penawaran.showKirimSurat.datatables');
// Download Surat Tender KJPP
Route::get('penawaran/{noreg}/suratTenderKJPP/{id}/downloadSuratTenderKJPP', [TenderController::class, 'downloadSuratTenderKJPP'])
->name('penawaran.downloadSuratTenderKJPP');
// Penawaran Ulang
Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(