feat: Mark more columns as money columns

This commit is contained in:
Ahmed Bouhuolia
2024-09-04 18:46:42 +02:00
parent 66fb0c9fa3
commit fe5cd5a8ea
8 changed files with 34 additions and 7 deletions

View File

@@ -30,13 +30,14 @@ const dateRangeMapper = (data, index, column) => ({
key: column.key, key: column.key,
accessor: `cells[${index}].value`, accessor: `cells[${index}].value`,
width: getColumnWidth(data, `cells.${index}.value`, { width: getColumnWidth(data, `cells.${index}.value`, {
magicSpacing: 10, magicSpacing: 12,
minWidth: 100, minWidth: 100,
}), }),
className: `date-period ${column.key}`, className: `date-period ${column.key}`,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
align: Align.Right, align: Align.Right,
money: true
}); });
/** /**
@@ -50,11 +51,12 @@ const totalMapper = (data, index, column) => ({
textOverview: true, textOverview: true,
Cell: CellTextSpan, Cell: CellTextSpan,
width: getColumnWidth(data, `cells[${index}].value`, { width: getColumnWidth(data, `cells[${index}].value`, {
magicSpacing: 10, magicSpacing: 12,
minWidth: 100, minWidth: 100,
}), }),
disableSortBy: true, disableSortBy: true,
align: Align.Right, align: Align.Right,
money: true
}); });
/** /**

View File

@@ -61,9 +61,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true, textOverview: true,
width: getColumnWidth(tableRows, 'cells[5].value', { width: getColumnWidth(tableRows, 'cells[5].value', {
minWidth: 100, minWidth: 100,
magicSpacing: 10, magicSpacing: 12,
}), }),
align: Align.Right, align: Align.Right,
money: true,
}, },
{ {
Header: intl.get('debit'), Header: intl.get('debit'),
@@ -72,9 +73,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true, textOverview: true,
width: getColumnWidth(tableRows, 'cells[6].value', { width: getColumnWidth(tableRows, 'cells[6].value', {
minWidth: 100, minWidth: 100,
magicSpacing: 10, magicSpacing: 12,
}), }),
align: Align.Right, align: Align.Right,
money: true,
}, },
{ {
Header: intl.get('running_balance'), Header: intl.get('running_balance'),
@@ -83,9 +85,10 @@ export const useCustomersTransactionsColumns = () => {
textOverview: true, textOverview: true,
width: getColumnWidth(tableRows, 'cells[7].value', { width: getColumnWidth(tableRows, 'cells[7].value', {
minWidth: 120, minWidth: 120,
magicSpacing: 10, magicSpacing: 12,
}), }),
align: Align.Right, align: Align.Right,
money: true,
}, },
], ],
[tableRows], [tableRows],

View File

@@ -3,7 +3,6 @@ import * as R from 'ramda';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { Align } from '@/constants'; import { Align } from '@/constants';
import { CellTextSpan } from '@/components/Datatable/Cells';
import { getColumnWidth } from '@/utils'; import { getColumnWidth } from '@/utils';
const getTableCellValueAccessor = (index) => `cells[${index}].value`; const getTableCellValueAccessor = (index) => `cells[${index}].value`;
@@ -34,6 +33,7 @@ const percentageOfIncomeAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -52,6 +52,7 @@ const percentageOfExpenseAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -70,6 +71,7 @@ const percentageOfColumnAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -88,6 +90,7 @@ const percentageOfRowAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -106,6 +109,7 @@ const previousYearAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -124,6 +128,7 @@ const previousYearChangeAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -142,6 +147,7 @@ const previousYearPercentageAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -160,6 +166,7 @@ const previousPeriodAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -178,6 +185,7 @@ const previousPeriodChangeAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -196,6 +204,7 @@ const previousPeriodPercentageAccessor = R.curry((data, column) => {
align: Align.Right, align: Align.Right,
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
money: true
}; };
}); });
@@ -274,10 +283,10 @@ const totalColumn = R.curry((data, column) => {
Header: column.label, Header: column.label,
accessor, accessor,
textOverview: true, textOverview: true,
Cell: CellTextSpan,
width, width,
disableSortBy: true, disableSortBy: true,
align: hasChildren ? Align.Center : Align.Right, align: hasChildren ? Align.Center : Align.Right,
money: true
}; };
}); });
@@ -338,6 +347,7 @@ const dateRangeColumn = R.curry((data, column) => {
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
align: isDateColumnHasColumns ? Align.Center : Align.Right, align: isDateColumnHasColumns ? Align.Center : Align.Right,
money: true
}; };
return R.compose( return R.compose(
R.when( R.when(

View File

@@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => {
...column, ...column,
align: Align.Right, align: Align.Right,
width, width,
money: true
}; };
}); });

View File

@@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => {
...column, ...column,
align: Align.Right, align: Align.Right,
width, width,
money: true
}; };
}); });

View File

@@ -49,6 +49,7 @@ const percentageColumnAccessor = () => ({
width: 140, width: 140,
textOverview: true, textOverview: true,
align: Align.Right, align: Align.Right,
money: true
}); });
/** /**
@@ -61,6 +62,7 @@ const totalColumnAccessor = () => ({
width: 140, width: 140,
textOverview: true, textOverview: true,
align: Align.Right, align: Align.Right,
money: true
}); });
/** /**

View File

@@ -19,6 +19,7 @@ import {
useVendorsTransactionsCsvExport, useVendorsTransactionsCsvExport,
useVendorsTransactionsXlsxExport, useVendorsTransactionsXlsxExport,
} from '@/hooks/query'; } from '@/hooks/query';
import { Align } from '@/constants';
/** /**
* Retrieve vendors transactions columns. * Retrieve vendors transactions columns.
@@ -63,6 +64,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 100, minWidth: 100,
magicSpacing: 10, magicSpacing: 10,
}), }),
money: true,
align: Align.Right,
}, },
{ {
Header: intl.get('debit'), Header: intl.get('debit'),
@@ -73,6 +76,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 100, minWidth: 100,
magicSpacing: 10, magicSpacing: 10,
}), }),
money: true,
align: Align.Right,
}, },
{ {
Header: intl.get('running_balance'), Header: intl.get('running_balance'),
@@ -83,6 +88,8 @@ export const useVendorsTransactionsColumns = () => {
minWidth: 120, minWidth: 120,
magicSpacing: 10, magicSpacing: 10,
}), }),
money: true,
align: Align.Right,
}, },
], ],
[table], [table],

View File

@@ -160,6 +160,7 @@ export function useReceiptsTableColumns() {
align: 'right', align: 'right',
clickable: true, clickable: true,
textOverview: true, textOverview: true,
money: true,
className: clsx(CLASSES.FONT_BOLD), className: clsx(CLASSES.FONT_BOLD),
}, },
{ {