Merge pull request 'Updated alignment for controller' (#267) from ranjith-dev into master

Reviewed-on: #267

app/Http/Controllers/CharacteristicApprovalController.php

@@ -3,15 +3,14 @@
 namespace App\Http\Controllers;
 
 use App\Models\RequestCharacteristic;
-use Illuminate\Http\Request;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 
 class CharacteristicApprovalController extends Controller
 {
     /**
      * Display a listing of the resource.
      */
-
     public function approve(Request $request)
     {
         return $this->updateStatus($request, 'Approved');
@@ -53,14 +52,15 @@ class CharacteristicApprovalController extends Controller
 
         if (in_array($currentStatus, ['Approved', 'Rejected'])) {
             return view('approval.already-processed', [
-                'status' => $currentStatus
+                'status' => $currentStatus,
             ]);
         }
 
         return view('approval.hold-form', compact('id', 'level'));
     }
 
-    public function rejectForm(Request $request){
+    public function rejectForm(Request $request)
+    {
         $id = $request->query('id');
         // $level = $request->query('level');
         $level = (int) $request->query('level');
@@ -78,7 +78,7 @@ class CharacteristicApprovalController extends Controller
 
         if (in_array($currentStatus, ['Approved', 'Rejected'])) {
             return view('approval.already-processed', [
-                'status' => $currentStatus
+                'status' => $currentStatus,
             ]);
         }
 
@@ -92,15 +92,18 @@ class CharacteristicApprovalController extends Controller
             'level' => 'required|integer',
             'remark' => 'required|string',
         ]);
+
         return $this->updateStatus($request, 'Hold', false);
     }
 
-    public function rejectSave(Request $request){
+    public function rejectSave(Request $request)
+    {
         $request->validate([
             'id' => 'required|integer',
             'level' => 'required|integer',
             'remark' => 'required|string',
         ]);
+
         return $this->updateStatus($request, 'Rejected', false);
     }
 
@@ -151,7 +154,6 @@ class CharacteristicApprovalController extends Controller
     //     };
     // }
 
-
     // protected function updateStatus(Request $request, string $status)
     // {
     //     $requestId = $request->query('id');
@@ -208,11 +210,10 @@ class CharacteristicApprovalController extends Controller
     //     };
     // }
 
-
     protected function updateStatus(Request $request, string $status, bool $returnView = true)
     {
         $requestId = $request->input('id');
-        $level     = (int) $request->input('level');
+        $level = (int) $request->input('level');
 
         $record = RequestCharacteristic::findOrFail($requestId);
 
@@ -248,19 +249,19 @@ class CharacteristicApprovalController extends Controller
         if ($alreadyProcessed) {
             if ($returnView) {
                 return view('approval.already-processed', [
-                    'status' => 'Already processed'
+                    'status' => 'Already processed',
                 ]);
             }
 
             return response()->json([
                 'status' => false,
-                'message' => 'This request has already been processed.'
+                'message' => 'This request has already been processed.',
             ], 404);
         }
 
         $updateData = [
             $statusColumn => $status,
-            $remarkColumn => $request->input('remark')
+            $remarkColumn => $request->input('remark'),
         ];
 
         if ($status == 'Approved') {
@@ -278,16 +279,15 @@ class CharacteristicApprovalController extends Controller
         if ($returnView) {
             return match ($status) {
                 'Approved' => view('approval.success'),
-                'Hold'     => view('approval.hold-success'),
+                'Hold' => view('approval.hold-success'),
                 'Rejected' => view('approval.reject-success'),
-                default    => abort(500),
+                default => abort(500),
             };
         }
 
         return response()->json(['status' => true, 'message' => 'Status updated successfully']);
     }
 
-
     public function index()
     {
         //