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

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

@@ -312,7 +312,7 @@ class ClaimController extends Controller
         ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
         ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
         ->where('corporate_employees.corporate_id', '=', $corporate_id)
-        ->where('request_logs.status_final_log', '=', 'approved')
+        // ->where('request_logs.status_final_log', '=', 'approved')
         ->where('request_logs.deleted_at', '=', null)
         ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
             $query->where('request_logs.submission_date', '>=', $start)
@@ -528,7 +528,7 @@ class ClaimController extends Controller
                         $penjamin,
                         !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
                         !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
-                        '',
+                        '0',
                         '',
                         '',
                         '',

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

@@ -124,6 +124,7 @@ class OrganizationController extends Controller
             'type' => 'hospital',
             'status' => $request->active == 1 ? 'active' : 'inactive',
             'description' => $request->description,
+            'corporate_id_partner' => $request->corporate_id_partner
         ]);
 
         if ($request->phone != null) {

frontend/dashboard/src/pages/Master/Hospitals/Form.tsx

@@ -222,6 +222,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop
         console.log('formData', formData);
         const response = await axios.post('/organizations', formData);
       } else {
+
         formData.append('_method', 'PUT');
         const response = await axios.post(
           '/organizations/' + currentOrganizations?.id ?? '',
@@ -257,13 +258,30 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop
   const [district, setDistrict] = useState<any>([]);
   const [village, setVillage] = useState<any>([]);
 
+  let corporate_selected = [];
+  if (defaultValues?.corporate_id_partner) {
+      if (defaultValues.corporate_id_partner.includes(',')) {
+          corporate_selected = defaultValues.corporate_id_partner.split(",").map(Number);
+      } else {
+          corporate_selected = [Number(defaultValues.corporate_id_partner)];
+      }
+  }
+
+
   const [corporate_id_partner, setCorporateIdPartner] = useState<any>([]);
   const [selectedCorporatID, setSelectedCorporateID] = useState<any>([]);
- 
+
+
+  useEffect(()=> {
+    setSelectedCorporateID(corporate_selected)
+  }, [defaultValues])
+
+  console.log(corporate_selected, 'test')
+
   const handleSelectChange = (event, selectedOptions:any) => {
     const selectedValues = selectedOptions.map(option => option.value);
     setSelectedCorporateID(selectedValues);
-    setValue('corporate_id_partner', selectedCorporatID)
+    setValue('corporate_id_partner', selectedValues)
   };
 
   useEffect(() => {
@@ -329,9 +347,6 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop
     if (values.corporate_id_partner) {
       loadCorporateIdPartner();
     }
-
-    console.log(corporate_id_partner, 'test');
-    
   }, [values.corporate_id_partner])
 
 
@@ -509,7 +524,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop
                     <Autocomplete
                       id="combo-box-demo"
                       options={corporate_id_partner}
-                      getOptionLabel={(option) => option.label}
+                      getOptionLabel={(option) => option.label ?? findValueCorporate.label ?? ''}
                       value={corporate_id_partner.filter(option => selectedCorporatID.includes(option.value))}
                       onChange={handleSelectChange}
                       multiple  // Enable multiple selections