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

Update penawaran status to 'proposal-tender'

Browse Source 
Changed the status filter from 'persetujuan-penawaran' to 'proposal-tender' in multiple controllers, ensuring consistency in status management throughout the application. Also corrected some trailing whitespaces and improved code readability.
This commit is contained in:
Daeng Deni Mardaeni
2024-11-04 17:04:44 +07:00
parent e8ff13ce6a
commit 19ad8fad76
3 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/ProsesPenawaranUlangController.php
View File

@@ -41,16 +41,16 @@ class ProsesPenawaranUlangController extends Controller
$query =PenawaranTender::query()
->select('penawaran.*',DB::raw("CONCAT(DATE_FORMAT(penawaran.start_date, '%d %M %Y'), ' - ', DATE_FORMAT(penawaran.end_date, '%d %M %Y')) AS date_range"), 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
->where('penawaran.status','=','persetujuan-penawaran')
->withCount('penawarandetails');
->where('penawaran.status','=','proposal-tender')
->withCount('penawarandetails');
// Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search');
$query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}
@@ -118,11 +118,11 @@ class ProsesPenawaranUlangController extends Controller
if (request()->ajax()) {
$id = $request->id;
$penawaran = PenawaranTender::where('status','=','persetujuan-penawaran')->find($id);
$penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id);
if ($penawaran) {
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id)
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id')
->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
->where('detail_penawaran.status','=',1)
->get();
@@ -143,7 +143,7 @@ class ProsesPenawaranUlangController extends Controller
{
$penawaranString = convertSlug($penawaran->status);
$penawaran->status = $penawaranString;
}
}
$data['penawaran'] = $penawaran;
$data['penawrandetails'] = $penawrandetails;
@@ -176,7 +176,7 @@ class ProsesPenawaranUlangController extends Controller
if ($validator['fails']) {
$data['message'] = $validator['errors'];
$data['status'] = 'error';
}
}
else
{
// cek masa aktif penawaran
@@ -187,7 +187,7 @@ class ProsesPenawaranUlangController extends Controller
{
DB::beginTransaction();
try {
$dataDetailPenawaranLog = [
'detail_penawaran_id' =>$detailpenawaran->id,
'kjpp_rekanan_id' =>$detailpenawaran->kjpp_rekanan_id,
@@ -201,15 +201,15 @@ class ProsesPenawaranUlangController extends Controller
'authorized_at' =>$detailpenawaran->authorized_at,
'created_at' =>$detailpenawaran->created_at,
'updated_at' =>$detailpenawaran->updated_at,
'deleted_at' =>$detailpenawaran->deleted_at,
'deleted_at' =>$detailpenawaran->deleted_at,
'created_by' =>$detailpenawaran->created_by,
'updated_by' =>$detailpenawaran->updated_by,
'deleted_by' =>$detailpenawaran->deleted_by
];
PenawaranDetailTenderLog::create($dataDetailPenawaranLog);
$biaya_penawaran="";
if($request->biaya_penawaran)
$biaya_penawaran= str_replace(".","",$request->biaya_penawaran);
@@ -222,9 +222,9 @@ class ProsesPenawaranUlangController extends Controller
{
$file_tmp = $request->file('dokumen_persetujuan');
$folderPath = 'uploads/penawaran/';
if ($file_tmp->isValid())
if ($file_tmp->isValid())
{
$myFile=$file_tmp->getClientOriginalName(); // nama file with extension
$myFile=$file_tmp->getClientOriginalName(); // nama file with extension
$file_name = pathinfo($myFile, PATHINFO_FILENAME); // nama file without extension
$extension = $file_tmp->getClientOriginalExtension();
@@ -247,9 +247,9 @@ class ProsesPenawaranUlangController extends Controller
{
$data['status'] = 'error';
$data['message']['check_file'] = array("Silahkan upload file");
}
$detailpenawaran->update($dataDetailPenawaran);
if($pleaseCommit)
@@ -279,7 +279,7 @@ class ProsesPenawaranUlangController extends Controller
$data['status'] = 'error';
$data['message']['active_date_range'] = array("Penawaran sudah di tutup");
}
}
} else {
@@ -288,7 +288,7 @@ class ProsesPenawaranUlangController extends Controller
}
return response()->json($data);
}
}
// delete KJPP di detail_penawaran (status di buat 0)
public function updateKJPPStatus(Request $request, $id): JsonResponse
@@ -316,16 +316,16 @@ class ProsesPenawaranUlangController extends Controller
'authorized_at' =>$model->authorized_at,
'created_at' =>$model->created_at,
'updated_at' =>$model->updated_at,
'deleted_at' =>$model->deleted_at,
'deleted_at' =>$model->deleted_at,
'created_by' =>$model->created_by,
'updated_by' =>$model->updated_by,
'deleted_by' =>$model->deleted_by
];
PenawaranDetailTenderLog::create($dataDetailPenawaranLog);
// log
$data['id']=$id;
$dataku = ['status' => '0',
@@ -333,7 +333,7 @@ class ProsesPenawaranUlangController extends Controller
'updated_at' => now()
];
$model->update($dataku);
$model->update($dataku);
DB::commit();
$data['status'] = 'success';