diff --git a/src/components/confirm.tsx b/src/components/confirm.tsx index 67e18e9..01591c5 100644 --- a/src/components/confirm.tsx +++ b/src/components/confirm.tsx @@ -1,7 +1,16 @@ import Button from "@mui/material/Button"; import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogDescription, DialogBody } from '@/components/ui/dialog'; +import { useState } from "react"; const ConfirmDialog = ({ open, onClose, title, content, onYes, onNo, onOpenChange }: any) => { + const [a,setA] = useState(false); + + async function onClickYes() { + setA(true) + await onYes(); + setA(false) + } + return ( @@ -13,7 +22,7 @@ const ConfirmDialog = ({ open, onClose, title, content, onYes, onNo, onOpenChang - + diff --git a/src/pages/members/kyc/Kyc.tsx b/src/pages/members/kyc/Kyc.tsx index 0d226a4..bf07982 100644 --- a/src/pages/members/kyc/Kyc.tsx +++ b/src/pages/members/kyc/Kyc.tsx @@ -37,6 +37,10 @@ const Kyc = () => { }; const { getUser } = useAuthContext(); + useEffect(() => { + fetchCustomers(); + }, [member]); + async function fetchCustomers() { setIsReloading(true); try { @@ -185,11 +189,6 @@ const Kyc = () => { function setShowAddDialog(el: any) { setIsDialogOpen(el); } - - useEffect(() => { - fetchCustomers(); - }, [member]); - // if (isReloading) return ; return ( diff --git a/src/pages/members/manage-members/ManageMembers.tsx b/src/pages/members/manage-members/ManageMembers.tsx index 79f246e..195e2d3 100644 --- a/src/pages/members/manage-members/ManageMembers.tsx +++ b/src/pages/members/manage-members/ManageMembers.tsx @@ -34,6 +34,10 @@ const ManageMembers = () => { }; const { getUser } = useAuthContext(); + useEffect(() => { + fetchCustomers(); + }, []); + async function fetchCustomers(): Promise { setIsReloading(true); try { @@ -106,6 +110,7 @@ const ManageMembers = () => { setMember(data); setDialogOpen(true); } + const handleReload = () => { setIsReloading(true); fetchCustomers(); @@ -205,11 +210,6 @@ const ManageMembers = () => { function setShowAddDialog(el: any) { setIsDialogOpen(el); } - - useEffect(() => { - fetchCustomers(); - }, []); - // if (isReloading) return ; return ( diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx index ffb4efc..e6ff19b 100644 --- a/src/pages/members/manage-members/blocks/DetailMember.tsx +++ b/src/pages/members/manage-members/blocks/DetailMember.tsx @@ -65,7 +65,7 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa const handleChange = async (e: any) => { const { name, value } = e.target; if (name === "file_selfie" || name === "photouser" || name === 'file_document_id' || name === "file_document_id_selfie" || - name === "file_commercial_license") { // FOR FILE ONLY + name === "file_commercial_license"|| name === 'photomerchant') { // FOR FILE ONLY setFormData({ ...formData, [name]: e.target.files[0] }); } else if(name === "nationality") { setFormData({ ...formData, [name]: value }); @@ -258,14 +258,13 @@ const DetailMember = ({ showAddDialog, setShowAddDialog, handleSubmit, initialDa {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Merchant Address', 'merchantaddress', 'text', false, viewOnly): ''} {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Longitude Merchant', 'longitudemerchant', 'text', false, viewOnly): ''} {(formData.id || dialogType === "create") ? generateInput(formData, handleChange, 'Latitude Merchant', 'latitudemerchant', 'text', false, viewOnly): ''} + {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'Photo Merchant', 'photomerchant', previewImg, setPreviewImg): ''} {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Selfie', 'file_selfie', previewImg, setPreviewImg): ''} {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Document', 'file_document_id', previewImg, setPreviewImg): ''} {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Document & Selfie', 'file_document_id_selfie', previewImg, setPreviewImg): ''} {(formData.id || dialogType === "create") ? generateImage(formData, handleChange, 'File Commercial License', 'file_commercial_license', previewImg, setPreviewImg): ''} - - {(formData.id&&(page==='kyc'&&formData.destinationGroup === "Premium")) ? generateInput(formData, handleChange, 'Approval Premium Description', 'approval_description_premium', 'text', false, viewOnly): ''} {(formData.id&&(page==='kyc'&&formData.destinationGroup === "Agent")) ? generateInput(formData, handleChange, 'Approval Agent Description', 'approval_description_agent', 'text', false, viewOnly): ''}