tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-19 08:49:56 +07:00
parent 4a61537f50 e331c692bb
commit 081eaf6356
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/Internal/Http/Controllers/Api/RequestLogController.php
View File

@@ -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();

9
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -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'){