update bugs fix

Modules/Client/Http/Controllers/Api/ClaimRequestController.php

@@ -51,7 +51,13 @@ class ClaimRequestController extends Controller
               
                 $code = $this->getNextCode();        
                 $member = Member::find($member_id);
-                $newClaimRequest = ClaimRequestService::storeClaimRequest(code: $code, member: $member, paymentType: 'reimbursement', serviceCode: $request->service_code[$key]);
+                $newClaimRequest = ClaimRequestService::storeClaimRequest(
+                    row: [], 
+                    code: $code, 
+                    member: $member, 
+                    paymentType: 'reimbursement', 
+                    serviceCode: $request->service_code[$key], 
+                );
         
                 ClaimRequested::dispatch($newClaimRequest);
                  // Log History

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

@@ -68,7 +68,13 @@ class ClaimRequestController extends Controller
         ]);
         $code = $this->getNextCode();
         $member = Member::find($request->member_id);
-        $newClaimRequest = ClaimRequestService::storeClaimRequest(code: $code, member: $member, paymentType: 'reimbursement', serviceCode: $request->service_code);
+        $newClaimRequest = ClaimRequestService::storeClaimRequest(
+            row: [], 
+            code: $code, 
+            member: $member, 
+            paymentType: 'reimbursement', 
+            serviceCode: $request->service_code
+        );
 
         ClaimRequested::dispatch($newClaimRequest);
 

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

@@ -404,7 +404,6 @@ class ClaimController extends Controller
         // ->latest()
         ->get()->toArray();
         foreach ($claims as $index => $row){
-            dd($row);
             $rowData = [
                '', // Count of Usage
                $row['code'], // Claim Number

app/Services/ClaimRequestService.php

@@ -20,10 +20,10 @@ use Str;
 
 class ClaimRequestService{
 
-    public static function storeClaimRequest($row, $code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested', $organization_code = null)
+    public static function storeClaimRequest($row = null, $code, $member, $paymentType, $serviceCode, $submissionDate = null, $status = 'requested', $organization_code = null)
     {
         // try {
-
+            $organization = False;
             if($organization_code){
                 $organization = Organization::where('code', $organization_code)->first();
                 if (!$organization){

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

@@ -25,6 +25,7 @@ export type Claims = {
     payor_id: string;
     corporate_id: string;
     policy_number: string;
+    benefit_desc: string;
     member: Member;
     benefit: Benefit | boolean;
     status: string;

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

@@ -5,6 +5,7 @@ export type Corporate = {
   code: string;
   name?: string;
   welcome_message?: string;
+  payor_id: string;
   help_text?: string;
   logo?: any;
   logo_url?: string;

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

@@ -1,5 +1,7 @@
 // ----------------------------------------------------------------------
 
+import { Corporate, Plan } from "./corporates";
+
 export type Member = {
   id: string,
   member_id: string,
@@ -18,4 +20,6 @@ export type Member = {
   relation_with_principal: string,
   bpjs_class: string,
   active: string,
+  current_plan: Plan,
+  current_corporate: Corporate,
 };

frontend/dashboard/src/pages/Claims/List.tsx

@@ -92,8 +92,8 @@ export default function List() {
            <Button
               variant="contained"
               startIcon={<Download />}
+              onClick={() => handleGetData('DO')}
               sx={{ p: 1.8 }}
-              onClick={handleGetData}
             >
               Export
             </Button>
@@ -190,7 +190,7 @@ export default function List() {
           <TableCell align="left">{row.member?.current_corporate?.code}</TableCell>
           <TableCell align="left">{row.member?.current_corporate?.current_policy?.code}</TableCell>
           <TableCell align="left">{row.member?.member_id}</TableCell>
-          <TableCell align="left">{row.benefit ? row.benefit?.description : '-'}</TableCell>
+          <TableCell align="left">{row.benefit_desc}</TableCell>
          
           <TableCell align="center">
             {row.status == 'draft' && (<Label color='secondary' variant='ghost'>{capitalizeFirstLetter(row.status)}</Label>)}