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

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

Browse Source
This commit is contained in:
Server D3 Linksehat
2025-05-05 11:25:21 +07:00
parent 9bc2ecac96 a3e0c72908
commit 8b06eb77d1
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,7 @@ class CorporateMemberController extends Controller
$member->update([
'birth_date' => $request->birth_date,
'gender' => $request->gender,
'principal_id' => $request->principal_id,
]);
return response()->json([
@@ -172,7 +173,11 @@ class CorporateMemberController extends Controller
*/
public function destroy($id)
{
//
$member = Member::findOrFail($id);
// Menghapus member
$member->delete();
// Mengembalikan respons setelah penghapusan (misalnya sukses)
return response()->json(['message' => 'Member deleted successfully'], 200);
}

2
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -412,7 +412,7 @@ class MemberEnrollmentService
->first();
if (empty($member)) {
// throw new ImportRowException(__('enrollment.PRINCIPAL_NOT_IN_MEMBER_ID'), 0, null, $row);
throw new ImportRowException(__('enrollment.MAPING_ID_NOT_SAME_MEMBER_ID'), 0, null, $row);
} else {
// if ($member['record_type'] != 'P'){
// throw new ImportRowException(__('enrollment.PRINCIPAL_ID_NOT_SAME_MEMBER_ID'), 0, null, $row);

18
frontend/dashboard/src/pages/Corporates/Member/sections/DialogEditMember.tsx
View File

@@ -18,6 +18,7 @@ type DialogConfirmationType = {
onSubmit?: void;
member: {
member_id:string,
principal_id:string,
birth_date:string,
gender:string,
reason:string
@@ -25,11 +26,12 @@ type DialogConfirmationType = {
}
export default function DialogEditMember({member, setOpenDialog, openDialog, onSubmit} : DialogConfirmationType ) {
const navigate = useNavigate();
// const navigate = useNavigate();
const { corporate_id } = useParams();
const [formData, setFormData] = useState({
member_id: member?.member_id,
principal_id: member?.principal_id,
gender: member?.gender,
birth_date: member?.birth_date,
reason: member?.reason,
@@ -41,6 +43,7 @@ export default function DialogEditMember({member, setOpenDialog, openDialog, onS
// Update formData setiap kali requestLog berubah
setFormData({
member_id: member?.member_id || '',
principal_id: member?.principal_id || '',
gender: member?.gender || '',
birth_date: member?.birth_date || '',
reason: member?.reason || '',
@@ -74,7 +77,7 @@ export default function DialogEditMember({member, setOpenDialog, openDialog, onS
.then((response) => {
enqueueSnackbar('Update Member Success', { variant: 'success' });
setOpenDialog(false);
navigate(`/corporates/${corporate_id}/members`)
// navigate(`/corporates/${corporate_id}/members`)
window.location.reload()
})
.catch(({ response }) => {
@@ -106,6 +109,7 @@ export default function DialogEditMember({member, setOpenDialog, openDialog, onS
member_id: member?.member_id ?? '',
gender: member?.gender ?? '',
birth_date: member?.birth_date ?? '',
principal_id: member?.principal_id ?? '',
reason: member?.reason ?? '',
});
@@ -152,6 +156,16 @@ export default function DialogEditMember({member, setOpenDialog, openDialog, onS
onChange={(e) => handleChange('birth_date', e.target.value)}
/>
</Stack>
<Stack direction='row' spacing={2} sx={marginBottom2}>
<Typography variant='subtitle2' sx={style1} gutterBottom>Mapping ID</Typography>
<TextField
label="Mapping ID"
variant="outlined"
fullWidth
value={formData.principal_id ? formData.principal_id : ''}
onChange={(e) => handleChange('principal_id', e.target.value)}
/>
</Stack>
<Stack direction='row' spacing={2} sx={marginBottom2}>
<Typography variant='subtitle2' sx={style1} gutterBottom>Gender</Typography>
<Autocomplete