Skip to content

Commit 486c95f

Browse files
committed
feat(condo): DOMA-4364 Remove volume, units and tariff from receipts modal
1 parent 6e05c77 commit 486c95f

File tree

1 file changed

+0
-68
lines changed

1 file changed

+0
-68
lines changed

apps/condo/domains/billing/hooks/useServicesTableColumns.tsx

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ import { useIntl } from '@condo/next/intl'
33
import { getTextRender, getMoneyRender } from '@condo/domains/common/components/Table/Renders'
44
import { TableRecord } from '@condo/domains/common/components/Table/Index'
55
import get from 'lodash/get'
6-
import { Tooltip } from '@condo/domains/common/components/Tooltip'
76

87
type AlignType = 'right' | 'left' | 'center'
98

109
const DETAILED_COLUMNS_AMOUNT = 9
1110
const BASE_COLUMNS_AMOUNT = 2
12-
const DEFAULT_VOLUME_MAX_DECIMALS = 4
1311

1412

1513
const textRender = getTextRender()
@@ -29,21 +27,6 @@ const getExpandTextRender = (detailed: boolean) => {
2927
}
3028
}
3129

32-
const getHideCellTextRender = () => {
33-
return function render (text: string, record: TableRecord) {
34-
if (get(record, ['children', 'length'])) {
35-
return {
36-
props: {
37-
colSpan: 0,
38-
},
39-
}
40-
}
41-
return {
42-
children: textRender(text),
43-
}
44-
}
45-
}
46-
4730
const getAdvancedMoneyRender = (intl, currencyCode: string) => {
4831
const moneyRender = getMoneyRender(intl, currencyCode)
4932
return function render (text: string, record: TableRecord) {
@@ -57,30 +40,6 @@ const getAdvancedMoneyRender = (intl, currencyCode: string) => {
5740
}
5841
}
5942

60-
const getVolumeRender = (decimals: number) => {
61-
return function render (text: string, record: TableRecord) {
62-
if (get(record, ['children', 'length'])) {
63-
return {
64-
props: {
65-
colSpan: 0,
66-
},
67-
}
68-
}
69-
if (!text) return textRender(text)
70-
const volume = parseFloat(text)
71-
const scaleRate = Math.pow(10, decimals)
72-
const roundedVolume = Math.round((volume + Number.EPSILON) * scaleRate) / scaleRate
73-
if (roundedVolume === volume) {
74-
return (
75-
<Tooltip title={text}>{roundedVolume}</Tooltip>
76-
)
77-
}
78-
return (
79-
<Tooltip title={text}>{roundedVolume}</Tooltip>
80-
)
81-
}
82-
}
83-
8443
export const useServicesTableColumns = (detailed: boolean, currencyCode: string) => {
8544
const intl = useIntl()
8645
const ToPayTitle = intl.formatMessage({ id: 'field.TotalPayment' })
@@ -98,8 +57,6 @@ export const useServicesTableColumns = (detailed: boolean, currencyCode: string)
9857
const moneyAlign: AlignType = 'right'
9958
return useMemo(() => {
10059
const expandTextRender = getExpandTextRender(detailed)
101-
const hideTextRender = getHideCellTextRender()
102-
const volumeRender = getVolumeRender(DEFAULT_VOLUME_MAX_DECIMALS)
10360
const columns = {
10461
name: {
10562
title: ServiceTitle,
@@ -124,28 +81,6 @@ export const useServicesTableColumns = (detailed: boolean, currencyCode: string)
12481
align: moneyAlign,
12582
render: moneyRender,
12683
},
127-
volume: {
128-
title: VolumeTitle,
129-
key: 'serviceVolume',
130-
dataIndex: ['toPayDetails', 'volume'],
131-
width: '10%',
132-
render: volumeRender,
133-
},
134-
units: {
135-
title: UnitsTitle,
136-
key: 'serviceMeasure',
137-
dataIndex: ['toPayDetails', 'measure'],
138-
width: '10%',
139-
render: hideTextRender,
140-
},
141-
tariff: {
142-
title: TariffTitle,
143-
key: 'serviceTariff',
144-
dataIndex: ['toPayDetails', 'tariff'],
145-
width: '10%',
146-
align: moneyAlign,
147-
render: moneyRender,
148-
},
14984
privileges: {
15085
title: PrivilegesTitle,
15186
key: 'servicePrivileges',
@@ -175,9 +110,6 @@ export const useServicesTableColumns = (detailed: boolean, currencyCode: string)
175110
return detailed
176111
? [
177112
columns.name,
178-
columns.volume,
179-
columns.units,
180-
columns.tariff,
181113
columns.privileges,
182114
columns.recalculation,
183115
columns.penalty,

0 commit comments

Comments
 (0)