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

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

@@ -569,6 +569,12 @@ class CorporateController extends Controller
                     "file_url" => url('files/Template Update Status Request LOG.xlsx')
                 ]);
                 break;
+            case 'template-request-log':
+                return Helper::responseJson([
+                    'file_name' => "Template Import Request LOG.xlsx.xlsx",
+                    "file_url" => url('files/Template Import Request LOG.xlsx.xlsx')
+                ]);
+                break;
             default:
                 return Helper::responseJson([], 'error', 404);
                 break;

Modules/Internal/Services/RequestLogService.php

@@ -179,6 +179,14 @@ class RequestLogService
 
             $benefit = Benefit::where('code', $row['benefit_id'])->first();
 
+            if (!$benefit){
+                $statusFinalLog = 'requested';
+                $final_log = 0;
+            } else {
+                $statusFinalLog = $status;
+                $final_log = 1;
+            }
+
             $requestLog = RequestLog::updateOrCreate(
             [
                 'code' => $code
@@ -190,8 +198,8 @@ class RequestLogService
                 'discharge_date' => $row['submission_date'],
                 'payment_type' => 'cashless',
                 'status' => $status,
-                'status_final_log' => $status,
+                'status_final_log' => $statusFinalLog,
-                'final_log' =>$row['status_final_log'] == 'Y' ? 1 : 0,
+                'final_log' =>$final_log,
                 'import_system' =>TRUE,
                 'catatan' => $row['catatan'],
                 'policy_id' => $member->currentPolicy->id ?? null,
@@ -200,20 +208,24 @@ class RequestLogService
                 'approved_final_log_at' => $row['approved_final_log_at'],
             ]);
 
-            $requestLogBenefit = RequestLogBenefit::updateOrCreate(
-            [
-                'request_log_id' => $requestLog->id,
-            ],
-            [
-                'request_log_id' => $requestLog->id,
-                'benefit_id' => $benefit->id,
-                'amount_incurred' => $row['total_billing'],
-                'amount_approved' => $row['amount_approval'],
-                'amount_not_approved' => $row['amount_not_approval'],
-                'excess_paid' => $row['amount_not_approval'],
-                'created_by' => auth()->user()->id,
 
-            ]);
+            if ($benefit) { // jika tidak ada benefit nya maka belum ngisi benefit nya
+                RequestLogBenefit::updateOrCreate(
+                [
+                    'request_log_id' => $requestLog->id,
+                ],
+                [
+                    'request_log_id' => $requestLog->id,
+                    'benefit_id' => $benefit->id,
+                    'amount_incurred' => $row['total_billing'],
+                    'amount_approved' => $row['amount_approval'],
+                    'amount_not_approved' => $row['amount_not_approval'],
+                    'excess_paid' => $row['amount_not_approval'],
+                    'created_by' => auth()->user()->id,
+
+                ]);
+            }
+
 
             // Commit transaksi
             DB::commit();

frontend/dashboard/src/@types/claims.ts

@@ -105,5 +105,7 @@ export type Import = {
   result_file: {
     url: string,
     name: string,
+    total_success_row: number,
+    total_failed_row: number
   }
 }

frontend/dashboard/src/pages/CustomerService/Request/List.tsx

@@ -221,7 +221,7 @@ export default function List() {
                 }}
               >
                 <MenuItem onClick={handleImportButton}>Import</MenuItem>
-                <MenuItem onClick={() => {handleGetTemplate('request-log')}}>Download Template</MenuItem>
+                <MenuItem onClick={() => {handleGetTemplate('template-request-log')}}>Download Template</MenuItem>
                 <MenuItem onClick={() => {handleGetData('data-request-log')}}>Download Request LOG</MenuItem>
               </Menu>
             {/* <Button
@@ -265,10 +265,19 @@ export default function List() {
             </LoadingButton>
           </Stack>
         )}
-         {importResult && (
+
+        {importResult && (
           <Stack direction={'row'} sx={{ px: 2, pb: 2 }}>
             <Box sx={{ color: 'text.secondary' }}>
-              Last Import Result Report :{' '}
+              Last Import Result :{' '}
+              <Box sx={{ color: 'success.main', display: 'inline' }}>
+                {importResult.total_success_row ?? 0}
+              </Box>{' '}
+              Row Processed,{' '}
+              <Box sx={{ color: 'error.main', display: 'inline' }}>
+                {importResult.total_failed_row}
+              </Box>{' '}
+              Failed, Report :{' '}
               <a href={importResult.result_file?.url ?? '#'}>
                 {importResult.result_file?.name ?? '-'}
               </a>