Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2024-01-22 11:53:36 +07:00
7 changed files with 49 additions and 13 deletions

View File

@@ -317,12 +317,15 @@ class RequestLogController extends Controller
public function requestFinalLog(Request $request)
{
$data = [
'request_logs_id' => $request->request_logs_id
'request_logs_id' => $request->request_logs_id,
'discharge_date' => $request->discharge_date,
];
$validator = Validator::make($request->all(), [
'request_logs_id' => 'required'
'request_logs_id' => 'required',
'discharge_date' => 'required'
], [
'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID'])
'request_logs_id.required' => trans('Validation.required',['attribute' => 'Request Logs ID']),
'discharge_date.required' => trans('Validation.required',['attribute' => 'Discharge Date'])
]);
if ($validator->fails())
{
@@ -336,7 +339,8 @@ class RequestLogController extends Controller
->where('request_logs.id', '=', $request->request_logs_id)
->update([
'status_final_log' => 'requested',
'final_log' => 1
'final_log' => 1,
'discharge_date' => $request->discharge_date,
]);
if ($request->hasFile('result_files')) {
foreach ($request->result_files as $file) {