diff --git a/Modules/Internal/Services/RequestLogService.php b/Modules/Internal/Services/RequestLogService.php index f2d896c0..d6f5ab3e 100644 --- a/Modules/Internal/Services/RequestLogService.php +++ b/Modules/Internal/Services/RequestLogService.php @@ -183,8 +183,14 @@ class RequestLogService ]; $code = $this->makeCode($row['code'], $data); - $status = $row['status_final_log'] == 'Y' ? 'approved' : 'requested'; - + if ($row['status_final_log'] == 'Y'){ + $status = 'approved'; + } else if ($row['status_final_log'] == 'C'){ + $status = 'canceled'; + } else { + $status = 'requested'; + } + $service = Service::where('name', $row['service'])->first(); if ($service){ $serviceCode = $service->code; diff --git a/frontend/dashboard/src/pages/CustomerService/Request/List.tsx b/frontend/dashboard/src/pages/CustomerService/Request/List.tsx index 4388ae08..01b83b9c 100644 --- a/frontend/dashboard/src/pages/CustomerService/Request/List.tsx +++ b/frontend/dashboard/src/pages/CustomerService/Request/List.tsx @@ -377,6 +377,9 @@ export default function List() { row.status == "declined" ? () : + row.status == "canceled" ? + () + : () }