diff --git a/Modules/Internal/Transformers/RequestLogResource.php b/Modules/Internal/Transformers/RequestLogResource.php index 8f0c6458..4bf3cdfe 100644 --- a/Modules/Internal/Transformers/RequestLogResource.php +++ b/Modules/Internal/Transformers/RequestLogResource.php @@ -25,6 +25,7 @@ class RequestLogResource extends JsonResource 'id' => $this->id, 'code' => $this->code, 'submission_date' => $this->submission_date, + 'submission_date_fgl' => $this->approved_final_log_at, 'member_name' => $this->member->name, 'status' => $this->status ?? 'unknown', 'provider' => $provider ? $provider->name : '-', diff --git a/Modules/Internal/Transformers/RequestLogShowResource.php b/Modules/Internal/Transformers/RequestLogShowResource.php index 3b7e774f..26fa5409 100644 --- a/Modules/Internal/Transformers/RequestLogShowResource.php +++ b/Modules/Internal/Transformers/RequestLogShowResource.php @@ -107,6 +107,7 @@ class RequestLogShowResource extends JsonResource 'principal_name' => $requestLog['member']['principal_id'] ? Helper::principalName($requestLog['member']['principal_id']) : '-', 'relation_with_principal' => Helper::relationWithPrincipal($requestLog['member']['relation_with_principal']), 'submission_date' => $requestLog['submission_date'], + 'approved_final_log_at' => $requestLog['approved_final_log_at'], // submission final log 'discharge_date' => $requestLog['discharge_date'], 'service_type' => Helper::serviceName($requestLog['service_code']), 'claim_method' => $requestLog['payment_type'], diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx index 15a3a77f..48044d83 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Detail.tsx @@ -192,7 +192,7 @@ export default function Detail() { Submission Date - {requestLog?.submission_date ? fDateTimesecond(requestLog?.submission_date) : '-'} + {requestLog?.approved_final_log_at ? fDateTimesecond(requestLog?.approved_final_log_at) : '-'} diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/List.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/List.tsx index 5ac5e5af..960e2674 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/List.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/List.tsx @@ -350,7 +350,7 @@ export default function List() { {row.code} {row.provider} {row.member_name} - + {row.service_name} {row.payment_type_name} diff --git a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx index fe0aeefb..46fdd02d 100644 --- a/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx +++ b/frontend/dashboard/src/pages/CustomerService/FinalLog/Model/Types.tsx @@ -15,7 +15,7 @@ export type FinalLogType = { code : string, member : Member, member_name : string, - submission_date : string, + submission_date_fgl : string, service_name : string, payment_type_name : string, status_final_log : string, @@ -36,6 +36,7 @@ export type DetailFinalLogType = { gender : string, marital_status : string, submission_date : string, + approved_final_log_at : string, service_type : string, claim_method : string, status : string,