diff --git a/src/pages/master/aldeias/blocks/AddDialog.tsx b/src/pages/master/aldeias/blocks/AddDialog.tsx index 38e4c1b..6297958 100644 --- a/src/pages/master/aldeias/blocks/AddDialog.tsx +++ b/src/pages/master/aldeias/blocks/AddDialog.tsx @@ -175,7 +175,10 @@ const AddDialog = () => { - @@ -192,7 +195,7 @@ const AddDialog = () => { {sucos.map((suco) => ( { setFormField({ ...formField, diff --git a/src/pages/master/aldeias/blocks/EditDialog.tsx b/src/pages/master/aldeias/blocks/EditDialog.tsx index 79eb0ce..40033a7 100644 --- a/src/pages/master/aldeias/blocks/EditDialog.tsx +++ b/src/pages/master/aldeias/blocks/EditDialog.tsx @@ -198,7 +198,11 @@ const EditDialog = () => { - diff --git a/src/pages/master/provider/blocks/EditDialog.tsx b/src/pages/master/provider/blocks/EditDialog.tsx index ef00c19..ba8cb68 100644 --- a/src/pages/master/provider/blocks/EditDialog.tsx +++ b/src/pages/master/provider/blocks/EditDialog.tsx @@ -145,7 +145,7 @@ const EditDialog = () => { type: response?.data.type, status: response?.data.status, transaction_type: response?.data.transaction_type.id, - agent: response?.data.agent.id + agent: response?.data.agent?.id || '' })); } }, []); diff --git a/src/pages/master/provider/hooks/ManageProviderContext.tsx b/src/pages/master/provider/hooks/ManageProviderContext.tsx index 2cfe75f..85b25a9 100644 --- a/src/pages/master/provider/hooks/ManageProviderContext.tsx +++ b/src/pages/master/provider/hooks/ManageProviderContext.tsx @@ -94,7 +94,13 @@ const ManageProviderContextProvider = ({ children }: { children: React.ReactNode } }, { - accessorFn: (row) => row.provider_type, + accessorFn: (row) => { + const typeMapping: Record = { + h2h: 'Host To Host', + agent: 'Agent' + }; + return typeMapping[row.provider_type] || row.provider_type; + }, id: 'type', header: ({ column }) => , enableSorting: false, diff --git a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx index 4d2b233..7247c4a 100644 --- a/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx +++ b/src/pages/transfer/transfertype/hooks/ManageTransferTypeContext.tsx @@ -82,7 +82,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React header: ({ column }) => ( ), - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -90,7 +90,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => row.description, id: 'description', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -98,7 +98,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => row.wallet_origin?.name || 'N/A', id: 'wallet_origin', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -106,7 +106,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => row.wallet_destination.name || 'N/A', id: 'wallet_destination', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -114,7 +114,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => row.maximum_amount, id: 'maximum_amount', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -122,7 +122,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => row.minimum_amount, id: 'minimum_amount', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -132,7 +132,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React header: ({ column }) => ( ), - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -142,7 +142,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React header: ({ column }) => ( ), - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -152,7 +152,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React header: ({ column }) => ( ), - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -162,7 +162,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React header: ({ column }) => ( ), - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[250px]' } }, @@ -170,7 +170,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => (row.status === 'Y' ? 'Active' : 'Inactive'), id: 'status', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[150px]' } }, @@ -178,7 +178,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React accessorFn: (row) => (row.status_approval === 'Y' ? 'Yes' : 'No'), id: 'status_approval', header: ({ column }) => , - enableSorting: true, + enableSorting: false, enableHiding: false, meta: { headerClassName: 'w-[150px]' } }, @@ -211,22 +211,29 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React ], [handleEditDialog, handleDeleteDialog] ); + const doGetTransferTypeListData = async ( page: number, limit: number, sorting: any, filter: any ) => { - sorting = sorting.length == 0 ? [{ id: 'id', desc: false }] : sorting; + + const orderField = 'created_at'; + + const orderDirection = sorting.length > 0 ? (sorting[0].desc ? 'DESC' : 'ASC') : 'DESC'; + filter = filter.length == 0 ? {} : { any: filter[0].value?.toLowerCase() }; + const response = await GetData(`${API_URL}/transactiontype/list`, { limit: limit, page: page + 1, with_deleted: false, - order_field: sorting[0].id, - order_direction: sorting[0].desc ? 'ASC' : 'DESC', + order_field: orderField, + order_direction: orderDirection, filter: JSON.stringify(filter) }); + return { data: response?.data.list, totalCount: response?.data.total_count }; }; @@ -253,7 +260,7 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React pagination={{ size: 10 }} layout={{ card: true }} toolbar={} - sorting={[{ id: 'id', desc: true }]} + sorting={[{ id: 'created_at', desc: true }]} // Default sorting serverSide={true} onFetchData={({ pageIndex, pageSize, sorting, columnFilters }) => doGetTransferTypeListData(pageIndex, pageSize, sorting, columnFilters) @@ -268,4 +275,4 @@ const ManageTransferTypeContextProvider = ({ children }: { children: React.React }; export { ManageTransferTypeContext, ManageTransferTypeContextProvider }; -export type { TransferType }; +export type { TransferType }; \ No newline at end of file