Uncommented code (skip mail if already hold) and update trigger_at null on approved or rejected
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled

This commit is contained in:
dhanabalan
2026-02-11 10:00:55 +05:30
parent 6cb67362d5
commit 3dd5b30070

View File

@@ -58,23 +58,24 @@ class CharacteristicApprovalController extends Controller
}
}
// foreach ($levels as $lvl => $column) {
// if ($record->$column == 'Hold') {
foreach ($levels as $lvl => $column)
{
if ($record->$column == 'Hold') {
// if ($lvl == $level) {
// return view('approval.already-processed', [
// 'status' => 'On Hold',
// ]);
// }
// else
// {
// return view('approval.already-processed', [
// 'status' => 'Hold',
// 'message' => 'On Hold',
// ]);
// }
// }
// }
if ($lvl == $level) {
return view('approval.already-processed', [
'status' => 'On Hold',
]);
}
// else
// {
// return view('approval.already-processed', [
// 'status' => 'Hold',
// 'message' => 'On Hold',
// ]);
// }
}
}
$allowedMailStatusByLevel = [
1 => 'Sent',
@@ -355,8 +356,6 @@ class CharacteristicApprovalController extends Controller
], 403);
}
$workflowRecords = RequestCharacteristic::where('plant_id', $record->plant_id)
->where('machine_id', $record->machine_id)
->where('aufnr', $record->aufnr)
@@ -369,6 +368,10 @@ class CharacteristicApprovalController extends Controller
$approvedAtColumn => Carbon::now(),
];
if (in_array($status, ['Approved', 'Rejected'])) {
$updateData['trigger_at'] = null;
}
foreach ($pendingRecords as $rec) {
$rec->update($updateData);
}