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

# Conflicts:
#	routes/breadcrumbs.php
This commit is contained in:
Daeng Deni Mardaeni
2024-12-10 16:29:14 +07:00
3 changed files with 39 additions and 4 deletions

View File

@@ -171,7 +171,11 @@ class KJPPController extends Controller
$validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
$validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
$validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
$validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
if (empty($validated['jenis_aset_id'])) {
$validated['jenis_aset_id'] = json_encode([]);
} else {
$validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
}
// Tambahkan nama file ke data yang divalidasi
$validated['attachment'] = $filename;
@@ -434,7 +438,11 @@ class KJPPController extends Controller
$validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
$validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
$validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
$validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
if (empty($validated['jenis_aset_id'])) {
$validated['jenis_aset_id'] = json_encode([]);
} else {
$validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
}
// Perbarui data di database
KJPP::where('id', $id)->update($validated);