diff --git a/public/locales/bg/expenses.json b/public/locales/bg/expenses.json index d15134285..496371eaf 100644 --- a/public/locales/bg/expenses.json +++ b/public/locales/bg/expenses.json @@ -18,7 +18,7 @@ "approvedById": "Одобрен от (Id)", "approvedBy": "Одобрен от", "approved": "Одобрен", - "action": "Действие", + "action": "Действия", "empty": "Празно", "date": "Дата", "attached-files": "Прикачени файлове", diff --git a/src/components/admin/expenses/grid/DetailsModal.tsx b/src/components/admin/expenses/grid/DetailsModal.tsx index 51a1c4e29..2c5b591e2 100644 --- a/src/components/admin/expenses/grid/DetailsModal.tsx +++ b/src/components/admin/expenses/grid/DetailsModal.tsx @@ -24,7 +24,6 @@ export default observer(function DetailsModal() { { name: t('common:fields.currency'), value: data?.currency }, { name: t('expenses:fields.amount'), value: data?.amount }, { name: t('expenses:fields.vaultId'), value: data?.vaultId }, - { name: t('expenses:fields.deleted'), value: data?.deleted?.toString() }, { name: t('expenses:fields.description'), value: data?.description }, { name: t('expenses:fields.documentId'), value: data?.documentId }, { diff --git a/src/components/admin/expenses/grid/Grid.tsx b/src/components/admin/expenses/grid/Grid.tsx index 7c6954480..a0dc1a547 100644 --- a/src/components/admin/expenses/grid/Grid.tsx +++ b/src/components/admin/expenses/grid/Grid.tsx @@ -57,6 +57,24 @@ export default observer(function Grid() { const columns: GridColDef[] = [ { field: 'id', headerName: 'ID' }, + { + field: 'actions', + headerName: t('expenses:fields.action'), + headerAlign: 'left', + width: 120, + type: 'actions', + headerClassName: classes.gridColumn, + renderCell: (params: GridRenderCellParams): React.ReactNode => { + return ( + + ) + }, + }, { field: 'type', headerName: t('expenses:fields.type'), @@ -68,7 +86,7 @@ export default observer(function Grid() { headerName: t('expenses:fields.amount'), headerClassName: classes.gridColumn, align: 'right', - width: 90, + width: 100, renderCell: (params: GridRenderCellParams): React.ReactNode => { if (!params.row.amount) { return '0' @@ -102,30 +120,6 @@ export default observer(function Grid() { }, flex: 1, }, - { - field: 'deleted', - headerName: t('expenses:fields.deleted'), - headerClassName: classes.gridColumn, - width: 90, - }, - { - field: 'actions', - headerName: t('expenses:fields.action'), - headerAlign: 'left', - width: 120, - type: 'actions', - headerClassName: classes.gridColumn, - renderCell: (params: GridRenderCellParams): React.ReactNode => { - return ( - - ) - }, - }, ] return ( @@ -142,7 +136,6 @@ export default observer(function Grid() { pageSizeOptions={[5, 10]} pagination autoHeight - checkboxSelection disableRowSelectionOnClick /> {/* making sure we don't sent requests to the API when not needed */}