TIMOR-TELECOM/revenue-fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.shiblysolution.id/TPAY/dashboard

Browse Source
This commit is contained in:
Narul Hidayah
2025-04-11 19:05:29 +07:00
parent f028885b3d 31f58a38b3
commit 71676e61d5
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/members/kyc/Kyc.tsx
View File

@ -112,6 +112,10 @@ const Kyc = () => {
updateData.updated_by = userLogin.data ? userLogin.data.id : ''; updateData.updated_by = userLogin.data ? userLogin.data.id : '';
let today = new Date(); let today = new Date();
updateData.updated_at = today.toString(); 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.id;
delete updateData.pin; delete updateData.pin;
delete updateData.name; delete updateData.name;
@ -122,6 +126,14 @@ const Kyc = () => {
delete updateData.destinationGroup; delete updateData.destinationGroup;
delete updateData.statusApproval; delete updateData.statusApproval;
delete updateData.description; 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_id;
delete updateData.group_name; delete updateData.group_name;
delete updateData.group_description; delete updateData.group_description;

19
src/pages/members/manage-members/ManageMembers.tsx
View File

@ -93,6 +93,10 @@ const ManageMembers = () => {
updateData.updated_by = userLogin.data ? userLogin.data.id : ''; updateData.updated_by = userLogin.data ? userLogin.data.id : '';
let today = new Date(); let today = new Date();
updateData.updated_at = today.toString(); 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.id;
delete updateData.pin; delete updateData.pin;
delete updateData.name; delete updateData.name;
@ -103,6 +107,14 @@ const ManageMembers = () => {
delete updateData.destinationGroup; delete updateData.destinationGroup;
delete updateData.statusApproval; delete updateData.statusApproval;
delete updateData.description; 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_id;
delete updateData.group_name; delete updateData.group_name;
delete updateData.group_description; delete updateData.group_description;
@ -159,13 +171,6 @@ const ManageMembers = () => {
onNo={() => setDialogOpen(false)} onNo={() => setDialogOpen(false)}
/> />
{ member.id !== '' ? ( { member.id !== '' ? (
// <CustomerDialog
// open={isDialogOpen}
// handleClose={closeDialog}
// handleSubmit={handleSubmit}
// initialData={member}
// fetchCustomers={fetchCustomers}
// />
<DetailMember <DetailMember
showAddDialog={isDialogOpen} showAddDialog={isDialogOpen}
setShowAddDialog={setShowAddDialog} setShowAddDialog={setShowAddDialog}

6
src/pages/members/manage-members/blocks/DetailMember.tsx
View File

@ -168,6 +168,8 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa
function buttonOnSubmit(e:any) { function buttonOnSubmit(e:any) {
e.preventDefault(); e.preventDefault();
if (page === 'kyc' && formData.destinationGroup === "Premium" && !formData.approval_description_premium) return toast.warning(`Approval Premium Description needed!`)
if (page === 'kyc' && formData.destinationGroup === "Agent" && !formData.approval_description_premium) return toast.warning(`Approval Agent Description needed!`)
if (page === 'kyc' && !formData.description) return toast.warning(`Description for approval needed!`) if (page === 'kyc' && !formData.description) return toast.warning(`Description for approval needed!`)
handleSubmit(formData); handleSubmit(formData);
} }
@ -249,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, 'Bank Account', 'bank_account', 'text', false, viewOnly): ''}
{formData.id ? generateInput(formData, handleChange, 'iBank Number', 'ibank_number', '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&&(!page||formData.destinationGroup === "Premium")) ? 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 === "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') ? AdmAccess(page, formData, handleClose,fetchCustomers, viewOnly, setViewOnly): ""}
{(formData.id && page!=='kyc') ? CustomerWallet(formData.id) : ""} {(formData.id && page!=='kyc') ? CustomerWallet(formData.id) : ""}