Updated 'updated_by' column value on every change
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Gemini PR Review / Gemini PR Review (pull_request) Has been cancelled
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Has been cancelled
Laravel Larastan / larastan (pull_request) Has been cancelled
Laravel Pint / pint (pull_request) Has been cancelled

This commit is contained in:
dhanabalan
2026-05-11 10:41:13 +05:30
parent bce19056c7
commit b7e8182309

View File

@@ -2,10 +2,12 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\CharacteristicApproverMaster;
use App\Models\ClassCharacteristic; use App\Models\ClassCharacteristic;
use App\Models\RequestCharacteristic; use App\Models\RequestCharacteristic;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
class CharacteristicApprovalController extends Controller class CharacteristicApprovalController extends Controller
{ {
@@ -358,10 +360,26 @@ class CharacteristicApprovalController extends Controller
->where('work_flow_id', $record->work_flow_id) ->where('work_flow_id', $record->work_flow_id)
->get(); ->get();
$approverMasterNames = CharacteristicApproverMaster::find($record->characteristic_approver_master_id);
if (! $approverMasterNames) {
abort(500, 'Approver master not found');
}
$approverNameColumn = match ($level) {
1 => 'name1',
2 => 'name2',
3 => 'name3',
default => null,
};
$updatedBy = $approverNameColumn ? $approverMasterNames->$approverNameColumn : null;
$updateData = [ $updateData = [
$statusColumn => $status, $statusColumn => $status,
$remarkColumn => $request->input('remark'), $remarkColumn => $request->input('remark'),
$approvedAtColumn => Carbon::now(), $approvedAtColumn => Carbon::now(),
'updated_by' => $updatedBy,
]; ];
if (in_array($status, ['Approved', 'Rejected'])) { if (in_array($status, ['Approved', 'Rejected'])) {
@@ -386,6 +404,14 @@ class CharacteristicApprovalController extends Controller
// ->where('aufnr', $record->aufnr) // ->where('aufnr', $record->aufnr)
// ->update(['has_work_flow_id' => $record->work_flow_id]); // ->update(['has_work_flow_id' => $record->work_flow_id]);
if ($status == 'Rejected') {
$filePath = 'uploads/LaserDocs/'.$record->work_flow_id.'.png';
if (Storage::disk('local')->exists($filePath)) {
Storage::disk('local')->delete($filePath);
}
}
if ($returnView) { if ($returnView) {
return match ($status) { return match ($status) {
'Approved' => view('approval.success'), 'Approved' => view('approval.success'),