Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2024-11-13 22:15:13 +07:00
58 changed files with 3348 additions and 738 deletions

View File

@@ -434,94 +434,6 @@ Breadcrumbs::for('surveyor.data-pembanding', function (BreadcrumbTrail $trail) {
$trail->push('Form Pembanding');
});
Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
$trail->push('Registrasi', route('registrasi.index'));
});
Breadcrumbs::for('registrasi.edit', function (BreadcrumbTrail $trail) {
$trail->parent('registrasi');
$trail->push('Tambah Registrasi');
});
Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
$trail->parent('registrasi');
$trail->push('Detail Permohona');
});
// andy add
// andy add 20241009
Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
});
Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Proses Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Detail Data Proses Penawaran');
});
// andy add 20241009
// andy add Proses Penawaran Ulang
Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data 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');
});
Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaranulang');
$trail->push('Detail Data Proses Penawaran Ulang');
});
// andy add Proses Penawaran Ulang
// andy add Otorisasi Tender
Breadcrumbs::for('otorisasitender', function (BreadcrumbTrail $trail) {
$trail->push('Otorisasi Tender');
});
Breadcrumbs::for('otorisasitender.penawaran', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender');
$trail->push('Data Otorisasi Penawaran', route('otorisasitender.penawaran.index'));
});
Breadcrumbs::for('otorisasitender.penawaran.edit', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender.penawaran');
$trail->push('Tambah Data Otorisasi Penawaran ');
});
Breadcrumbs::for('otorisasitender.penawaran.show', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender.penawaran');
$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'));
});
Breadcrumbs::for('registrasifinal.show', function (BreadcrumbTrail $trail) {
$trail->parent('registrasifinal');
$trail->push('Detail Registrasi Final');
});
Breadcrumbs::for('registrasifinal.edit', function (BreadcrumbTrail $trail) {
$trail->parent('registrasifinal');
$trail->push('Tambah registrasifinal');
});
// andy add registrasi final
Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail) {
$trail->parent('otorisator');
$trail->push('Otorisator', route('otorisator.pelaporan.index'));
@@ -637,3 +549,6 @@ Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) {
$trail->parent('basicdata');
$trail->push('SLA', route('basicdata.sla.index'));
});
// add andy
require __DIR__ . '/breadcrumbs_registrasi.php';

View File

@@ -0,0 +1,95 @@
<?php
use Diglactic\Breadcrumbs\Breadcrumbs;
use Diglactic\Breadcrumbs\Generator as BreadcrumbTrail;
// registrasi
Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
$trail->push('Registrasi', route('registrasi.index'));
});
Breadcrumbs::for('registrasi.edit', function (BreadcrumbTrail $trail) {
$trail->parent('registrasi');
$trail->push('Tambah Registrasi');
});
Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
$trail->parent('registrasi');
$trail->push('Detail Permohona');
});
// registrasi
// prosespenawaran
Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
});
Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Proses Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Detail Data Proses Penawaran');
});
Breadcrumbs::for('tender.prosespenawaran.editulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaran');
$trail->push('Tambah Data Proses Penawaran Ulang');
});
// prosespenawaran
// Proses Penawaran Ulang
Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
$trail->parent('tender');
$trail->push('Data 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');
});
Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
$trail->parent('tender.prosespenawaranulang');
$trail->push('Detail Data Proses Penawaran Ulang');
});
// Proses Penawaran Ulang
// Otorisasi Tender
Breadcrumbs::for('otorisasitender', function (BreadcrumbTrail $trail) {
$trail->push('Otorisasi Tender');
});
Breadcrumbs::for('otorisasitender.penawaran', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender');
$trail->push('Data Otorisasi Penawaran', route('otorisasitender.penawaran.index'));
});
Breadcrumbs::for('otorisasitender.penawaran.edit', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender.penawaran');
$trail->push('Tambah Data Otorisasi Penawaran ');
});
Breadcrumbs::for('otorisasitender.penawaran.show', function (BreadcrumbTrail $trail) {
$trail->parent('otorisasitender.penawaran');
$trail->push('Detail Data Otorisasi Penawaran');
});
// 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
// registrasi final
Breadcrumbs::for('registrasifinal', function (BreadcrumbTrail $trail) {
$trail->push('Registrasi Final', route('registrasifinal.index'));
});
Breadcrumbs::for('registrasifinal.show', function (BreadcrumbTrail $trail) {
$trail->parent('registrasifinal');
$trail->push('Detail Registrasi Final');
});
Breadcrumbs::for('registrasifinal.edit', function (BreadcrumbTrail $trail) {
$trail->parent('registrasifinal');
$trail->push('Tambah registrasifinal');
});
// registrasi final

View File

@@ -47,9 +47,21 @@ Route::middleware(['auth'])->group(function () {
Route::put('/prosespenawaran/{prosespenawaran}', 'update')->name('prosespenawaran.update');
// update all
Route::put('/prosespenawaranAll/{prosespenawaranAll}', 'updateAll')->name('prosespenawaran.updateAll');
// update draft
Route::put('/prosespenawaranDraft/{prosespenawaranDraft}', 'updateDraft')->name('prosespenawaran.updateDraft');
// delete KJPP, status set = 0
Route::put('/prosespenawaranKJPPStatus/{prosespenawaranKJPPStatus}', 'updateKJPPStatus')->name('prosespenawaran.updateKJPPStatus');
// add KJPP to detail_penawaran
Route::post('prosespenawaran/store', 'store')->name('prosespenawaran.store');
Route::post('prosespenawaran/storeUlang', 'storeUlang')->name('prosespenawaran.storeUlang');
// edit proses penawaran ulang
Route::get('prosespenawaran/{prosespenawaran}/editulang', 'editulang')->name('prosespenawaran.editulang');
Route::post('prosespenawaran/setDataUlang', 'setDataUlang')->name('prosespenawaran.setDataUlang');
Route::put('/prosespenawaran2/{prosespenawaran2}', 'updateulang')->name('prosespenawaran.updateulang');
Route::put('/prosespenawaranKJPPStatusUlang/{prosespenawaranKJPPStatusUlang}', 'updateKJPPStatusUlang')->name('prosespenawaran.updateKJPPStatusUlang');
});
// Proses Penawaran Ulang
@@ -88,11 +100,14 @@ 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::get('spk/{spk}/download', 'download')->name('spk.download');
});
Route::controller(RegistrasiFinalController::class)->group(function(){