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

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -27,25 +27,30 @@ class RequestLogController extends Controller
             'service_code' => $request->service_code,
             'organization_id' => $request->organization_id,
             'organization_name' => $request->organization_name,
-            'address_provider' => $request->address_provider
+            'address_provider' => $request->address_provider,
+            'submission_date' => $request->submission_date,
         ];
         $validator = Validator::make($request->all(), [
             'member_id' => 'required',
-            'service_code' => 'required'
+            'service_code' => 'required',
+            'submission_date' => 'required'
         ], [
             'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
             'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
+            'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
         ]);
         if($request->organization_id)
         {
             $validator = Validator::make($request->all(), [
                 'organization_id' => 'required',
                 'member_id' => 'required',
-                'service_code' => 'required'
+                'service_code' => 'required',
+                'submission_date' => 'required'
             ], [
                 'organization_id.required' => trans('Validation.required',['attribute' => 'Provider ID']),
                 'member_id.required' => trans('Validation.required',['attribute' => 'Member ID']),
                 'service_code.required' => trans('Validation.required',['attribute' => 'Service Code']),
+                'submission_date.required' => trans('Validation.required',['attribute' => 'Submission Date']),
             ]);
         }
         if ($validator->fails())

Modules/Internal/Http/Controllers/Api/RequestLogController.php

@@ -122,7 +122,7 @@ class RequestLogController extends Controller
                             member: $member,
                             paymentType: 'cashless',
                             serviceCode: $request->service_code,
-                            submissionDate: null,
+                            submissionDate: $request->submission_date,
                             // status: 'approved',
                             status: 'requested', // di nonaktifkan dulu auto approved
                             organization_id: $request->organization_id,
@@ -145,7 +145,7 @@ class RequestLogController extends Controller
                             member: $member,
                             paymentType: 'cashless',
                             serviceCode: $request->service_code,
-                            submissionDate: null,
+                            submissionDate: $request->submission_date,
                             status: 'requested',
                             organization_id: $request->organization_id,
                             source: $request->source

app/Services/RequestLogService.php

@@ -26,7 +26,7 @@ class RequestLogService{
         $member, 
         $paymentType, 
         $serviceCode, 
-        $submissionDate = null, 
+        $submissionDate, 
         $status, $organization_id = null, 
         $source
     )
@@ -48,7 +48,7 @@ class RequestLogService{
             $requestLogData = [
                 'code' => $code,
                 'member_id' => $member->id,
-                'submission_date' => $submissionDate ?? now(),
+                'submission_date' => $submissionDate ? $submissionDate : now(),
                 'status' => $status,
                 'payment_type' => $paymentType,
                 'service_code' => $serviceCode,

frontend/hospital-portal/public/lang/en-US.json

@@ -14,6 +14,8 @@
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Please select services",
   "txtDialogMember5" : "Submission Date",
+  "txtDialogMember6" : "Please select submission date",
+  "txtCreateAt" : "Create at",
   "txtDateBirth" : "Date of Birth",
   "txtGender" : "Gender",
   "txtMaritalStatus" : "Marital Status",

frontend/hospital-portal/public/lang/id-ID.json

@@ -14,6 +14,8 @@
   "txtDialogMember3" : "Detail",
   "txtDialogMember4" : "Mohon pilih layanan",
   "txtDialogMember5" : "Tanggal Pengajuan",
+  "txtDialogMember6" : "Mohon pilih tanggal pengajuan",
+  "txtCreateAt" : "Tanggal Buat",
   "txtDateBirth" : "Tanggal Lahir",
   "txtGender" : "Jenis Kelamin",
   "txtMaritalStatus" : "Status Perkawinan",

frontend/hospital-portal/src/sections/dashboard/FormRequestLog.tsx

@@ -19,6 +19,9 @@ import { LanguageContext } from '@/contexts/LanguageContext';
 import Autocomplete from '@mui/material/Autocomplete';
 import TextField from '@mui/material/TextField';
 import Button from '@mui/material/Button';
+import { DatePicker, LocalizationProvider, MobileDatePicker } from '@mui/x-date-pickers';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { fPostFormat } from '@/utils/formatTime';
 
 interface MemberType {
     members: any;
@@ -33,6 +36,8 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
     const { localeData }: any =  useContext(LanguageContext);
     const [serviceCode, setServiceCode] = useState<string>('');
     const [idProvider, setIdProvider] = useState<number>(0);
+    //Submission date
+    const [submissionDate, setSubmissionDate] = useState<string>(format(new Date(), "yyyy MMM d"));
 
     const [submitLoading, setSubmitLoading] = useState<boolean>(false);
     function submitRequest() {
@@ -46,13 +51,19 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
             enqueueSnackbar(localeData.txtDialogMember4, { variant: 'warning' });
             return false;
         }
+        if(submissionDate == '')
+        {
+            enqueueSnackbar(localeData.txtDialogMember6, { variant: 'warning' });
+            return false;
+        }
         setSubmitLoading(true);
         const formData = {
             member_id: member.members.id,
             service_code: serviceCode,
             organization_id: idProvider,
             organization_name : name,
-            address_provider: alamat
+            address_provider: alamat,
+            submission_date: fPostFormat(submissionDate, 'yyyy-MM-dd')
         };
         axios
         .post('/request-log', formData)
@@ -103,7 +114,7 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
         <Stack direction="column" spacing={2}>
         <Stack direction="row" justifyContent={'end'} sx={{ marginBottom: 2 }} spacing={2}>
             <Typography variant='body2' sx={{color: '#757575'}}>
-            {localeData.txtDialogMember5}
+                {localeData.txtCreateAt}
             </Typography>
             <Typography variant='body2' sx={{fontWeight:'bold'}}>{format(new Date(), "d MMM yyyy")}</Typography>
         </Stack>
@@ -177,6 +188,23 @@ export default function FormRequestClaim({ member, handleSubmitSuccess }: FormRe
             </Stack>
         </Stack>
 
+        <Stack direction="row" spacing={2}>
+            <Stack spacing={2} sx={{ width: '100%' }}>
+                <Typography variant='subtitle1'>{localeData.txtDialogMember5} *</Typography>
+                <LocalizationProvider dateAdapter={AdapterDateFns}>
+                    <DatePicker
+                        label={localeData.txtDialogMember5}
+                        value={submissionDate}
+                        onChange={(newValue:any) => {
+                        setSubmissionDate(  (newValue));
+                        }}
+                        inputFormat="dd-MM-yyyy"
+                        renderInput={(params) => <TextField sx={{width:'40%'}} {...params} required/>}
+                    />
+                </LocalizationProvider>
+            </Stack>
+        </Stack>
+
         <Card sx={{ p: 1, background: '#f4f6f8'}}>
             <Stack direction="row">
             <Avatar