diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php
index d98f7e9..22d6e1c 100644
--- a/app/Http/Controllers/TenderController.php
+++ b/app/Http/Controllers/TenderController.php
@@ -38,7 +38,8 @@ class TenderController extends Controller
// Jika nomor_registrasi sudah ada, kembalikan respon 403 Forbidden
if ($penawaranExists) {
- abort(403, 'Penawaran dengan nomor registrasi ini sudah ada.');
+ return redirect()->route('tender.penawaran.editPenawaran', ['noreg' => $noreg])
+ ->with('error', 'Penawaran dengan nomor registrasi ini sudah ada, Anda akan diarahkan ke halaman edit.');
}
$permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
@@ -394,33 +395,18 @@ class TenderController extends Controller
]);
}
- public function penawaran_ulang_show($noreg)
- {
- $penawaran = null;
- $kjpps = null;
- $tujuan_penilaian_kjpp = null;
- $jenis_laporan = null;
-
- $penawaran1 = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
- // dd($penawaran1->id);
- if ($penawaran1) {
- $penawaran = $penawaran1;
- $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran1->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
- $kjpps = KJPP::whereIn('id', $detail_penawaran)->get();
- $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::where('id', $penawaran->tujuan_penilaian_kjpp_id)->get();
- $jenis_laporan = JenisLaporan::where('id', $penawaran->jenis_laporan_id)->get();
- } else {
- $penawaran2 = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
- $penawaran = $penawaran2;
- }
-
- // dd($kjpps);
-
- return view('lpj::penawaran_ulang.show', compact('noreg', 'penawaran', 'kjpps', 'tujuan_penilaian_kjpp', 'jenis_laporan'));
- }
-
public function proses_penawaran_index()
{
return view('lpj::proses_penawaran/index');
}
+
+ // Tambahkan method untuk API di controller
+ public function checkPenawaranExistence($nomor_registrasi)
+ {
+ // Cek apakah nomor_registrasi ada dalam tabel penawaran
+ $exists = PenawaranTender::where('nomor_registrasi', $nomor_registrasi)->exists();
+
+ // Kembalikan hasil pengecekan sebagai JSON
+ return response()->json(['exists' => $exists]);
+ }
}
diff --git a/module.json b/module.json
index 07e1db9..0349958 100644
--- a/module.json
+++ b/module.json
@@ -5,9 +5,7 @@
"description": "",
"keywords": [],
"priority": 0,
- "providers": [
- "Modules\\Lpj\\Providers\\LpjServiceProvider"
- ],
+ "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"],
"files": [],
"menu": {
"main": [
@@ -18,9 +16,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Registrasi",
@@ -29,9 +25,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
},
{
"title": "Tender",
@@ -40,9 +34,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ],
+ "roles": ["Administrator", "admin"],
"sub": [
{
"title": "Data Penawaran",
@@ -50,9 +42,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
},
{
"title": "Data Proses Penawaran",
@@ -60,19 +50,15 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
},
{
"title": "Data Penawaran Ulang",
- "path": "tender.penawaran_ulang",
+ "path": "tender.penawaran.ulang",
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
}
]
},
@@ -83,9 +69,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Data Debitur",
@@ -94,9 +78,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Authorization",
@@ -105,9 +87,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-eo"]
},
{
"title": "Assignment",
@@ -116,9 +96,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","so"
- ]
+ "roles": ["Administrator", "so"]
},
{
"title": "Team Activity",
@@ -127,9 +105,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ]
+ "roles": ["so"]
},
{
"title": "Otorisator",
@@ -138,9 +114,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ],
+ "roles": ["so"],
"sub": [
{
"title": "Pelaporan",
@@ -148,9 +122,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ]
+ "roles": ["so"]
},
{
"title": "Pembayaran",
@@ -158,9 +130,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ]
+ "roles": ["so"]
},
{
"title": "Pembatalan",
@@ -168,9 +138,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ]
+ "roles": ["so"]
},
{
"title": "SLA",
@@ -178,12 +146,9 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "so"
- ]
+ "roles": ["so"]
}
]
-
},
{
@@ -193,9 +158,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo","admin"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin"]
},
{
"title": "Laporan",
@@ -204,9 +167,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo","admin", "so"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin", "so"]
}
],
"master": [
@@ -217,9 +178,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo","admin"
- ],
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin"],
"sub": [
{
"title": "Cabang",
@@ -227,9 +186,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Mata Uang",
@@ -237,9 +194,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Jenis Fasilitas Kredit",
@@ -247,9 +202,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Jenis Legalitas Jaminan",
@@ -257,9 +210,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Jenis Aset",
@@ -267,9 +218,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Jenis Dokumen",
@@ -277,9 +226,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Tujuan Penilaian",
@@ -287,9 +234,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Nilai Plafond",
@@ -297,9 +242,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Hubungan Pemilik Jaminan",
@@ -307,9 +250,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Hubungan Penghuni Jaminan",
@@ -317,9 +258,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","pemohon-ao","pemohon-eo"
- ]
+ "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
},
{
"title": "Arah Mata Angin",
@@ -327,9 +266,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator"
- ]
+ "roles": ["Administrator"]
},
{
"title": "Status Permohonan",
@@ -337,9 +274,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator"
- ]
+ "roles": ["Administrator"]
},
{
"title": "Region",
@@ -347,9 +282,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin","so"
- ]
+ "roles": ["Administrator", "admin", "so"]
},
{
"title": "Staff Appraisal",
@@ -357,9 +290,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","so"
- ]
+ "roles": ["Administrator", "so"]
},
{
"title": "Jenis Penilaian",
@@ -367,9 +298,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin","so"
- ]
+ "roles": ["Administrator", "admin", "so"]
},
{
"title": "KJPP",
@@ -377,9 +306,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
},
{
"title": "Tujuan Penilaian KJPP",
@@ -387,9 +314,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
},
{
"title": "Ijin Usaha",
@@ -397,9 +322,7 @@
"classes": "",
"attributes": [],
"permission": "",
- "roles": [
- "administrator","admin"
- ]
+ "roles": ["Administrator", "admin"]
}
]
}
diff --git a/resources/views/penawaran/index.blade.php b/resources/views/penawaran/index.blade.php
index e306437..30ffa22 100644
--- a/resources/views/penawaran/index.blade.php
+++ b/resources/views/penawaran/index.blade.php
@@ -24,8 +24,6 @@
Export to
Excel
- Penawaran
- Ulang
@@ -113,6 +111,45 @@
return char.toUpperCase();
});
}
+
+ // Function to check the existence of penawaran and update button
+ function checkPenawaranExistence(nomor_registrasi) {
+ // URL API untuk cek penawaran
+ const url = `/api/check-penawaran/${nomor_registrasi}`;
+
+ // Fetch data dari server
+ fetch(url)
+ .then(response => response.json())
+ .then(data => {
+ const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+ if (data.exists) {
+ // Jika penawaran ada, ganti tombol menjadi "Penawaran Ulang"
+ actionDiv.innerHTML = `
+
+
+
+
+
+
+ `;
+ } else {
+ // Jika tidak ada, tampilkan tombol "Tambah Penawaran"
+ actionDiv.innerHTML = `
+
+
+
+
+
+
+ `;
+ }
+ })
+ .catch(error => {
+ console.error('Error:', error);
+ const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+ actionDiv.innerHTML = `Error loading action`;
+ });
+ }