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