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

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

@@ -42,7 +42,7 @@ 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
@@ -114,7 +114,7 @@ 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)

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();

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

@@ -41,7 +41,7 @@ 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
@@ -118,7 +118,7 @@ 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)