poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 10 Packages Projects Releases Wiki Activity

ranjith-dev #327

Merged
jothi merged 3 commits from ranjith-dev into master 2026-02-11 04:48:26 +00:00
Conversation 0 Commits 3 Files Changed 3 +21 -18
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3dd5b30070 - Show all commits

39
app/Http/Controllers/CharacteristicApprovalController.php
View File

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