From 8ac9bc78a7c0104813c69c88d6c107042b1930f5 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 18 Jan 2024 11:24:25 +0700 Subject: [PATCH 1/2] update discharge date --- Modules/Internal/Http/Controllers/Api/RequestLogController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/Internal/Http/Controllers/Api/RequestLogController.php b/Modules/Internal/Http/Controllers/Api/RequestLogController.php index d2a282c8..9f13e3e6 100644 --- a/Modules/Internal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/Internal/Http/Controllers/Api/RequestLogController.php @@ -342,6 +342,9 @@ class RequestLogController extends Controller $requestLog->status_final_log = $status; $requestLog->approved_final_log_by = auth()->user()->id; $requestLog->approved_final_log_at = Carbon::now(); + if($requestLog->service_code != 'IP'){ + $requestLog->discharge_date = Carbon::now(); + } $requestLog->save(); From e331c692bbdf6857adae58ae90fc2f836aa1c59a Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Fri, 19 Jan 2024 08:48:08 +0700 Subject: [PATCH 2/2] update --- Modules/Internal/Services/MemberEnrollmentService.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index 16d9f3cf..4aa24464 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -341,11 +341,14 @@ class MemberEnrollmentService if ($date_from_row instanceof DateTime) { return $date_from_row->format('Y-m-d'); } else if ($date_from_row != null) { - return date('Y-m-d', strtotime($date_from_row)); + if (strtotime($date_from_row)){ + return date('Y-m-d', strtotime($date_from_row)); + } else { + throw new ImportRowException(__('Format Date Invalid'), 0, null, $row); + } } else { - return null; + throw new ImportRowException(__('Format Date Invalid'), 0, null, $row); } - } public function validateDate($dateString, $dateFormat = 'Ymd'){