From fe5cd5a8ea9d738d731a62a9f95a15b76f9be028 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Wed, 4 Sep 2024 18:46:42 +0200 Subject: [PATCH] feat: Mark more columns as money columns --- .../CashFlowStatement/dynamicColumns.tsx | 6 ++++-- .../CustomersTransactions/components.tsx | 9 ++++++--- .../ProfitLossSheet/dynamicColumns.tsx | 14 ++++++++++++-- .../PurchasesByItems/dynamicColumns.ts | 1 + .../SalesByItems/dynamicColumns.ts | 1 + .../VendorsBalanceSummary/components.tsx | 2 ++ .../VendorsTransactions/components.tsx | 7 +++++++ .../Sales/Receipts/ReceiptsLanding/components.tsx | 1 + 8 files changed, 34 insertions(+), 7 deletions(-) diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/dynamicColumns.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/dynamicColumns.tsx index cde12d338..cdb4b7fb8 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/dynamicColumns.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/dynamicColumns.tsx @@ -30,13 +30,14 @@ const dateRangeMapper = (data, index, column) => ({ key: column.key, accessor: `cells[${index}].value`, width: getColumnWidth(data, `cells.${index}.value`, { - magicSpacing: 10, + magicSpacing: 12, minWidth: 100, }), className: `date-period ${column.key}`, disableSortBy: true, textOverview: true, align: Align.Right, + money: true }); /** @@ -50,11 +51,12 @@ const totalMapper = (data, index, column) => ({ textOverview: true, Cell: CellTextSpan, width: getColumnWidth(data, `cells[${index}].value`, { - magicSpacing: 10, + magicSpacing: 12, minWidth: 100, }), disableSortBy: true, align: Align.Right, + money: true }); /** diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/components.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/components.tsx index 5bf73e1c1..ac30d3c25 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/components.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/components.tsx @@ -61,9 +61,10 @@ export const useCustomersTransactionsColumns = () => { textOverview: true, width: getColumnWidth(tableRows, 'cells[5].value', { minWidth: 100, - magicSpacing: 10, + magicSpacing: 12, }), align: Align.Right, + money: true, }, { Header: intl.get('debit'), @@ -72,9 +73,10 @@ export const useCustomersTransactionsColumns = () => { textOverview: true, width: getColumnWidth(tableRows, 'cells[6].value', { minWidth: 100, - magicSpacing: 10, + magicSpacing: 12, }), align: Align.Right, + money: true, }, { Header: intl.get('running_balance'), @@ -83,9 +85,10 @@ export const useCustomersTransactionsColumns = () => { textOverview: true, width: getColumnWidth(tableRows, 'cells[7].value', { minWidth: 120, - magicSpacing: 10, + magicSpacing: 12, }), align: Align.Right, + money: true, }, ], [tableRows], diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/dynamicColumns.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/dynamicColumns.tsx index 0c33d05f5..05e8ec2cb 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/dynamicColumns.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/dynamicColumns.tsx @@ -3,7 +3,6 @@ import * as R from 'ramda'; import { isEmpty } from 'lodash'; import { Align } from '@/constants'; -import { CellTextSpan } from '@/components/Datatable/Cells'; import { getColumnWidth } from '@/utils'; const getTableCellValueAccessor = (index) => `cells[${index}].value`; @@ -34,6 +33,7 @@ const percentageOfIncomeAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -52,6 +52,7 @@ const percentageOfExpenseAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -70,6 +71,7 @@ const percentageOfColumnAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -88,6 +90,7 @@ const percentageOfRowAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -106,6 +109,7 @@ const previousYearAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -124,6 +128,7 @@ const previousYearChangeAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -142,6 +147,7 @@ const previousYearPercentageAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -160,6 +166,7 @@ const previousPeriodAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -178,6 +185,7 @@ const previousPeriodChangeAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -196,6 +204,7 @@ const previousPeriodPercentageAccessor = R.curry((data, column) => { align: Align.Right, disableSortBy: true, textOverview: true, + money: true }; }); @@ -274,10 +283,10 @@ const totalColumn = R.curry((data, column) => { Header: column.label, accessor, textOverview: true, - Cell: CellTextSpan, width, disableSortBy: true, align: hasChildren ? Align.Center : Align.Right, + money: true }; }); @@ -338,6 +347,7 @@ const dateRangeColumn = R.curry((data, column) => { disableSortBy: true, textOverview: true, align: isDateColumnHasColumns ? Align.Center : Align.Right, + money: true }; return R.compose( R.when( diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts index 48712e5b7..8f162cb4f 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/dynamicColumns.ts @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => { ...column, align: Align.Right, width, + money: true }; }); diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/dynamicColumns.ts b/packages/webapp/src/containers/FinancialStatements/SalesByItems/dynamicColumns.ts index b71b4f7c5..451c363c7 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/dynamicColumns.ts +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/dynamicColumns.ts @@ -41,6 +41,7 @@ const numericColumnAccessor = R.curry((data, column) => { ...column, align: Align.Right, width, + money: true }; }); diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/components.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/components.tsx index 7bdf3a204..9530b15b4 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/components.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/components.tsx @@ -49,6 +49,7 @@ const percentageColumnAccessor = () => ({ width: 140, textOverview: true, align: Align.Right, + money: true }); /** @@ -61,6 +62,7 @@ const totalColumnAccessor = () => ({ width: 140, textOverview: true, align: Align.Right, + money: true }); /** diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/components.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/components.tsx index 22c09d764..58c9f81df 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/components.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/components.tsx @@ -19,6 +19,7 @@ import { useVendorsTransactionsCsvExport, useVendorsTransactionsXlsxExport, } from '@/hooks/query'; +import { Align } from '@/constants'; /** * Retrieve vendors transactions columns. @@ -63,6 +64,8 @@ export const useVendorsTransactionsColumns = () => { minWidth: 100, magicSpacing: 10, }), + money: true, + align: Align.Right, }, { Header: intl.get('debit'), @@ -73,6 +76,8 @@ export const useVendorsTransactionsColumns = () => { minWidth: 100, magicSpacing: 10, }), + money: true, + align: Align.Right, }, { Header: intl.get('running_balance'), @@ -83,6 +88,8 @@ export const useVendorsTransactionsColumns = () => { minWidth: 120, magicSpacing: 10, }), + money: true, + align: Align.Right, }, ], [table], diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/components.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/components.tsx index f26e18ac9..cf32e1845 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/components.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/components.tsx @@ -160,6 +160,7 @@ export function useReceiptsTableColumns() { align: 'right', clickable: true, textOverview: true, + money: true, className: clsx(CLASSES.FONT_BOLD), }, {