ranjith-dev #580

Merged
jothi merged 7 commits from ranjith-dev into master 2026-05-11 05:13:39 +00:00
Showing only changes of commit b7e8182309 - Show all commits

View File

@@ -2,10 +2,12 @@
namespace App\Http\Controllers;
use App\Models\CharacteristicApproverMaster;
use App\Models\ClassCharacteristic;
use App\Models\RequestCharacteristic;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
class CharacteristicApprovalController extends Controller
{
@@ -358,10 +360,26 @@ class CharacteristicApprovalController extends Controller
->where('work_flow_id', $record->work_flow_id)
->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 = [
$statusColumn => $status,
$remarkColumn => $request->input('remark'),
$approvedAtColumn => Carbon::now(),
'updated_by' => $updatedBy,
];
if (in_array($status, ['Approved', 'Rejected'])) {
@@ -386,6 +404,14 @@ class CharacteristicApprovalController extends Controller
// ->where('aufnr', $record->aufnr)
// ->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) {
return match ($status) {
'Approved' => view('approval.success'),