From d115894a64ac9fcc4c5c8c2c9748fc57d4e814e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Apr 2025 18:34:52 +0700 Subject: [PATCH 1/3] approval --- src/pages/members/manage-members/ManageMembers.tsx | 7 ------- src/pages/members/manage-members/blocks/DetailMember.tsx | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index b4ebdc7..2cd8e96 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -159,13 +159,6 @@ const ManageMembers = () => { onNo={() => setDialogOpen(false)} /> { member.id !== '' ? ( - // Date: Fri, 11 Apr 2025 18:59:23 +0700 Subject: [PATCH 2/3] fix member and kyc --- src/pages/members/kyc/Kyc.tsx | 8 ++++++++ src/pages/members/manage-members/ManageMembers.tsx | 8 ++++++++ src/pages/members/manage-members/blocks/DetailMember.tsx | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index 452b632..7270898 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -122,6 +122,14 @@ const Kyc = () => { delete updateData.destinationGroup; delete updateData.statusApproval; delete updateData.description; + delete updateData.municipio_id; + delete updateData.municipio_name; + delete updateData.posto_adms_id; + delete updateData.posto_adms_name; + delete updateData.suco_id; + delete updateData.suco_name; + delete updateData.aldeia_id; + delete updateData.aldeia_name; delete updateData.group_id; delete updateData.group_name; delete updateData.group_description; diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index 2cd8e96..048e28a 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -103,6 +103,14 @@ const ManageMembers = () => { delete updateData.destinationGroup; delete updateData.statusApproval; delete updateData.description; + delete updateData.municipio_id; + delete updateData.municipio_name; + delete updateData.posto_adms_id; + delete updateData.posto_adms_name; + delete updateData.suco_id; + delete updateData.suco_name; + delete updateData.aldeia_id; + delete updateData.aldeia_name; delete updateData.group_id; delete updateData.group_name; delete updateData.group_description; diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx index 0e2c669..1980510 100644 --- a/src/pages/members/manage-members/blocks/DetailMember.tsx +++ b/src/pages/members/manage-members/blocks/DetailMember.tsx @@ -251,8 +251,8 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa {formData.id ? generateInput(formData, handleChange, 'Bank Account', 'bank_account', 'text', false, viewOnly): ''} {formData.id ? generateInput(formData, handleChange, 'iBank Number', 'ibank_number', 'text', false, viewOnly): ''} - {formData.id ? generateInput(formData, handleChange, 'Approval Premium Description', 'approval_description_premium', 'text', false, viewOnly): ''} - {formData.id ? generateInput(formData, handleChange, 'Approval Agent Description', 'approval_description_agent', 'text', false, viewOnly): ''} + {(formData.id&&(!page||formData.destinationGroup === "Premium")) ? generateInput(formData, handleChange, 'Approval Premium Description', 'approval_description_premium', 'text', false, viewOnly): ''} + {(formData.id&&(!page||formData.destinationGroup === "Agent")) ? generateInput(formData, handleChange, 'Approval Agent Description', 'approval_description_agent', 'text', false, viewOnly): ''} {(formData.id && page!=='kyc') ? AdmAccess(page, formData, handleClose,fetchCustomers, viewOnly, setViewOnly): ""} {(formData.id && page!=='kyc') ? CustomerWallet(formData.id) : ""} From 31f58a38b32c1195d6cbab04742922e4cead7f29 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Apr 2025 19:01:29 +0700 Subject: [PATCH 3/3] fix member and kyc --- src/pages/members/kyc/Kyc.tsx | 4 ++++ src/pages/members/manage-members/ManageMembers.tsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index 7270898..ff48332 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -112,6 +112,10 @@ const Kyc = () => { updateData.updated_by = userLogin.data ? userLogin.data.id : ''; let today = new Date(); updateData.updated_at = today.toString(); + updateData.municipio = updateData.municipio_id; + updateData.posto_adms = updateData.posto_adms_id; + updateData.suco = updateData.suco_id; + updateData.aldeia = updateData.aldeia_id; delete updateData.id; delete updateData.pin; delete updateData.name; diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index 048e28a..6be4b05 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -93,6 +93,10 @@ const ManageMembers = () => { updateData.updated_by = userLogin.data ? userLogin.data.id : ''; let today = new Date(); updateData.updated_at = today.toString(); + updateData.municipio = updateData.municipio_id; + updateData.posto_adms = updateData.posto_adms_id; + updateData.suco = updateData.suco_id; + updateData.aldeia = updateData.aldeia_id; delete updateData.id; delete updateData.pin; delete updateData.name;