Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

This commit is contained in:
2024-11-20 08:25:53 +07:00
12 changed files with 344 additions and 278 deletions

View File

@@ -298,9 +298,7 @@ class PenilaianController extends Controller
$q->orWhere('status', 'LIKE', '%' . $search . '%');
});
}
// $query->whereRaw('LOWER(status) = ?', ['registered']);
$query->whereIn('status', ['registered', 'proses_penawaran']);
$query->whereIn('status', ['registered', 'registrasi-final']);
$query->whereHas('region.teams.teamsUsers.user', function ($q) {
$q->where('id', Auth::user()->id);
});

View File

@@ -147,30 +147,8 @@
if ($permohonan->status == 'revisi') {
$validate['status'] = 'order';
}
$permohonan->update($validate);
$afterRequest = $permohonan->fresh()->toArray();
// Process file upload
$file = null;
if ($request->hasFile('attachment')) {
$file = $request->file('attachment');
}
// Get keterangan if provided
$keterangan = $request->input('keterangan') ?? null;
$status =$validate['status'] ?? $permohonan->status;
$this->historyService->createHistory(
$permohonan,
$status,
$keterangan,
$beforeRequest,
$afterRequest,
$file
);
return redirect()
->route('permohonan.index')->with('success', 'Permohonan updated successfully');
} catch (Exception $e) {