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

40
app/Http/Controllers/OtorisasiPenawaranController.php
View File

@@ -42,16 +42,16 @@ class OtorisasiPenawaranController extends Controller
$query =PenawaranTender::query() $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') ->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') ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
->where('penawaran.status','=','persetujuan-penawaran') ->where('penawaran.status','=','proposal-tender')
->withCount('penawarandetails'); ->withCount('penawarandetails');
// Apply search filter if provided // Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%'); $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%'); $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%'); $q->orWhere('status', 'LIKE', '%' . $search . '%');
}); });
} }
@@ -114,19 +114,19 @@ class OtorisasiPenawaranController extends Controller
if (request()->ajax()) { if (request()->ajax()) {
$id = $request->id; $id = $request->id;
$penawaran = PenawaranTender::where('status','=','persetujuan-penawaran')->find($id); $penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id);
if ($penawaran) { if ($penawaran) {
$penawarandetailLogs = PenawaranDetailTenderLog::where('penawaran_id',$id) $penawarandetailLogs = PenawaranDetailTenderLog::where('penawaran_id',$id)
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran_logs.kjpp_rekanan_id') ->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran_logs.kjpp_rekanan_id')
->select('detail_penawaran_logs.*', DB::raw("DATE_FORMAT(detail_penawaran_logs.created_at, '%d-%m-%Y %H:%i') AS created_at2"),'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name') ->select('detail_penawaran_logs.*', DB::raw("DATE_FORMAT(detail_penawaran_logs.created_at, '%d-%m-%Y %H:%i') AS created_at2"),'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
->get(); ->get();
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id) $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') ->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')
->where('detail_penawaran.status','=',1) ->where('detail_penawaran.status','=',1)
->get(); ->get();
if(sizeof($penawarandetailLogs)>0) if(sizeof($penawarandetailLogs)>0)
{ {
$h=0; $h=0;
@@ -139,8 +139,8 @@ class OtorisasiPenawaranController extends Controller
} }
$h++; $h++;
} }
} }
$i=0; $i=0;
foreach($penawrandetails as $obj) foreach($penawrandetails as $obj)
@@ -149,17 +149,17 @@ class OtorisasiPenawaranController extends Controller
{ {
$penawrandetails_path = Storage::url($obj->dokumen_persetujuan); $penawrandetails_path = Storage::url($obj->dokumen_persetujuan);
$penawrandetails[$i]->dokumen_persetujuan = $penawrandetails_path; $penawrandetails[$i]->dokumen_persetujuan = $penawrandetails_path;
} }
$i++; $i++;
} }
$penawaranString = ""; $penawaranString = "";
if($penawaran->status) if($penawaran->status)
{ {
$penawaranString = convertSlug($penawaran->status); $penawaranString = convertSlug($penawaran->status);
$penawaran->status = $penawaranString; $penawaran->status = $penawaranString;
} }
$kjpp=null; $kjpp=null;
$kjpp = KJPP::pluck('name', 'id'); $kjpp = KJPP::pluck('name', 'id');
@@ -202,11 +202,11 @@ class OtorisasiPenawaranController extends Controller
// update status Penawaran menjadi SPK // update status Penawaran menjadi SPK
// update status Permohonan menjadi SPK // update status Permohonan menjadi SPK
// insert detail_permohonan_log // insert detail_permohonan_log
PenawaranDetailTender::where('status', 1) PenawaranDetailTender::where('status', 1)
->where('penawaran_id', $request->penawaran_id) ->where('penawaran_id', $request->penawaran_id)
->whereNotIn('id', [$id]) ->whereNotIn('id', [$id])
->update(['status' => 2, ->update(['status' => 2,
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now()
]); ]);
@@ -228,12 +228,12 @@ class OtorisasiPenawaranController extends Controller
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now()
]); ]);
// log // log
$detailPenawaran = PenawaranDetailTender::where('penawaran_id', $request->penawaran_id)->get(); $detailPenawaran = PenawaranDetailTender::where('penawaran_id', $request->penawaran_id)->get();
if(sizeof($detailPenawaran)>0) if(sizeof($detailPenawaran)>0)
{ {
foreach ($detailPenawaran as $model) { foreach ($detailPenawaran as $model) {
array_push($dataDetailPenawaranLog, [ array_push($dataDetailPenawaranLog, [
'detail_penawaran_id' =>$model->id, 'detail_penawaran_id' =>$model->id,
@@ -248,12 +248,12 @@ class OtorisasiPenawaranController extends Controller
'authorized_at' =>$model->authorized_at, 'authorized_at' =>$model->authorized_at,
'created_at' =>$model->created_at, 'created_at' =>$model->created_at,
'updated_at' =>$model->updated_at, 'updated_at' =>$model->updated_at,
'deleted_at' =>$model->deleted_at, 'deleted_at' =>$model->deleted_at,
'created_by' =>$model->created_by, 'created_by' =>$model->created_by,
'updated_by' =>$model->updated_by, 'updated_by' =>$model->updated_by,
'deleted_by' =>$model->deleted_by 'deleted_by' =>$model->deleted_by
]); ]);
} }
PenawaranDetailTenderLog::insert($dataDetailPenawaranLog); PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);

11
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -267,20 +267,15 @@ class ProsesPenawaranController extends Controller
{ {
DB::beginTransaction(); DB::beginTransaction();
try { try {
$dataPenawaran = ['status' => 'persetujuan-penawaran', $_updatestatus = ['status' => 'proposal-tender',
'updated_by' => Auth::id(),
'updated_at' => now()
];
$dataPermohonan = ['status' => 'persetujuan-penawaran',
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now()
]; ];
$permohonan = Permohonan::where('nomor_registrasi','=', $penawaran->nomor_registrasi)->first(); $permohonan = Permohonan::where('nomor_registrasi','=', $penawaran->nomor_registrasi)->first();
$penawaran->update($dataPenawaran); $penawaran->update($_updatestatus);
$permohonan->update($dataPermohonan); $permohonan->update($_updatestatus);
DB::commit(); DB::commit();

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

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