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

This commit is contained in:
Server D3 Linksehat
2025-09-22 16:07:43 +07:00
22 changed files with 1530 additions and 18 deletions

View File

@@ -346,6 +346,11 @@ class RequestLogController extends Controller
$requestLog->approved_at = Carbon::now();
}
if ($request->status_approval){
$requestLog->status_approval = $request->status_approval;
$requestLog->approval_nominal_by = auth()->user()->id;
}
$requestLog->save();
// update nirc member
@@ -1224,6 +1229,34 @@ class RequestLogController extends Controller
]);
}
}
return Helper::responseJson(data: $request->toArray(), message: 'File Success Uploaded');
}
public function approvalFiles(Request $request, $id)
{
Helper::setCustomPHPIniSettings();
$requestLog = RequestLog::findOrFail($id);
$nominal = $request->nominal;
if($nominal){
$requestLog->nominal = $nominal;
$requestLog->save();
}
if ($request->hasFile('approval_files')) {
foreach ($request->approval_files as $file) {
$fileData = File::storeFile('approval', $id, $file);
$requestLog->files()->updateOrCreate([
'type' => 'approval',
'name' => $fileData['name'],
'original_name' => $file->getClientOriginalName(),
'extension' => $file->getClientOriginalExtension(),
'source' => env('FILESYSTEM_DISK'),
'path' => $fileData['path'],
'created_by' => auth()->user()->id,
'updated_by' => auth()->user()->id,
'reason' => $request->reason,
]);
}
}
return Helper::responseJson(data: $request->toArray(), message: 'File Success Uploaded');
}