From 0a15c3a1b4a3309ec8649ff74619deb14f3bfea9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 11 Apr 2025 17:30:48 +0700 Subject: [PATCH 1/3] fix detail member --- src/pages/members/manage-members/Columns.tsx | 4 +++- src/pages/members/manage-members/blocks/DetailMember.tsx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/members/manage-members/Columns.tsx b/src/pages/members/manage-members/Columns.tsx index e657553..6c83c0b 100644 --- a/src/pages/members/manage-members/Columns.tsx +++ b/src/pages/members/manage-members/Columns.tsx @@ -178,5 +178,7 @@ export const initialMember = { posto_adms: '', suco: '', aldeia: '', - profession: '' + profession: '', + approval_description_premium: '', + approval_description_agent: '' }; diff --git a/src/pages/members/manage-members/blocks/DetailMember.tsx b/src/pages/members/manage-members/blocks/DetailMember.tsx index 2cb1950..30e39cf 100644 --- a/src/pages/members/manage-members/blocks/DetailMember.tsx +++ b/src/pages/members/manage-members/blocks/DetailMember.tsx @@ -249,7 +249,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 Description', 'description', '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!=='kyc') ? AdmAccess(page, formData, handleClose,fetchCustomers, viewOnly, setViewOnly): ""} {(formData.id && page!=='kyc') ? CustomerWallet(formData.id) : ""} From def9ab12a6ca9cb814496e3079881b8de8b467c1 Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Fri, 11 Apr 2025 17:32:11 +0700 Subject: [PATCH 2/3] update sorting on table Products --- src/pages/master/products/hooks/ManageProductsContext.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/master/products/hooks/ManageProductsContext.tsx b/src/pages/master/products/hooks/ManageProductsContext.tsx index 8c07643..856fd5c 100644 --- a/src/pages/master/products/hooks/ManageProductsContext.tsx +++ b/src/pages/master/products/hooks/ManageProductsContext.tsx @@ -280,7 +280,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode pagination={{ size: 10 }} toolbar={} layout={{ card: true }} - sorting={[{ id: 'Product.id', desc: false }]} + sorting={[{ id: 'Product.created_at', desc: false }]} serverSide={true} onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) => getProductsLists(pageIndex, pageSize, sorting, columnFilters) From df67b681bb57d2c48ae12f200cb8ed13c087775f Mon Sep 17 00:00:00 2001 From: Wikzyy Date: Fri, 11 Apr 2025 17:33:27 +0700 Subject: [PATCH 3/3] update sorting desc on table Products --- src/pages/master/products/hooks/ManageProductsContext.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/master/products/hooks/ManageProductsContext.tsx b/src/pages/master/products/hooks/ManageProductsContext.tsx index 856fd5c..236e306 100644 --- a/src/pages/master/products/hooks/ManageProductsContext.tsx +++ b/src/pages/master/products/hooks/ManageProductsContext.tsx @@ -280,7 +280,7 @@ const ManageProductsContextProvider = ({ children }: { children: React.ReactNode pagination={{ size: 10 }} toolbar={} layout={{ card: true }} - sorting={[{ id: 'Product.created_at', desc: false }]} + sorting={[{ id: 'Product.created_at', desc: true }]} serverSide={true} onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) => getProductsLists(pageIndex, pageSize, sorting, columnFilters)