Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging
This commit is contained in:
@@ -60,7 +60,7 @@ class CorporateMemberController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
])
|
])
|
||||||
->groupBy('members.id')
|
->groupBy('members.id','members.person_id')
|
||||||
->paginate()
|
->paginate()
|
||||||
->appends($request->all());
|
->appends($request->all());
|
||||||
return Helper::paginateResources(MemberDataTableResource::collection($members));
|
return Helper::paginateResources(MemberDataTableResource::collection($members));
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export default function Dashboard() {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
setItemList(dummyData);
|
//setItemList(dummyData);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user