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

Merge branch 'feature/aso-digital-card' into staging

Browse Source
This commit is contained in:
R
2023-02-22 13:21:50 +07:00
parent 5cd23ff343 e51068b0a6
commit 9f95e89a9a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -240,7 +240,7 @@ class CorporateMemberController extends Controller
'currentPolicy', 'currentPolicy',
'currentPlan.corporateBenefits' => function ($benefit) use ($request) { 'currentPlan.corporateBenefits' => function ($benefit) use ($request) {
return $benefit->when($request->benefit_ids, function ($q, $ids) { return $benefit->when($request->benefit_ids, function ($q, $ids) {
return $q->whereIn('id', $ids); return $q->whereIn('benefit_id', $ids);
}); });
}, },
'currentPlan.corporateBenefits.benefit']); 'currentPlan.corporateBenefits.benefit']);

8
frontend/dashboard/src/pages/Report/Appointments/List.tsx
View File

@@ -212,10 +212,10 @@ export default function List() {
<Grid item xs={2}>Metode Pembayaran</Grid><Grid item xs="10">: {row.payment_method}</Grid> <Grid item xs={2}>Metode Pembayaran</Grid><Grid item xs="10">: {row.payment_method}</Grid>
<Grid item xs={2}>HIS RegID</Grid><Grid item xs="10">: {row.his_detail?.sRegID}</Grid> <Grid item xs={2}>HIS RegID</Grid><Grid item xs="10">: {row.his_detail?.sRegID}</Grid>
<Grid item xs={2}>HIS Medrec</Grid><Grid item xs="10">: {row.his_detail?.Medrec}</Grid> <Grid item xs={2}>HIS Medrec</Grid><Grid item xs="10">: {row.his_detail?.Medrec}</Grid>
<Grid item xs={2}>No HP</Grid><Grid item xs="10">: {row.patient.sPhone ?? ''}</Grid> <Grid item xs={2}>No HP</Grid><Grid item xs="10">: {row.patient?.sPhone ?? ''}</Grid>
<Grid item xs={2}>E-mail</Grid><Grid item xs="10">: {row.patient.sEmail ?? ''}</Grid> <Grid item xs={2}>E-mail</Grid><Grid item xs="10">: {row.patient?.sEmail ?? ''}</Grid>
<Grid item xs={2}>Alamat</Grid><Grid item xs="10">: {row.patient.detail.sAlamat ?? ''}</Grid> <Grid item xs={2}>Alamat</Grid><Grid item xs="10">: {row.patient?.detail?.sAlamat ?? ''}</Grid>
<Grid item xs={2}>KTP</Grid><Grid item xs="10">: {row.patient.detail.sKTP ?? ''}</Grid> <Grid item xs={2}>KTP</Grid><Grid item xs="10">: {row.patient?.detail?.sKTP ?? ''}</Grid>
</Grid> </Grid>
</Stack> </Stack>
</Collapse> </Collapse>