QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 21:00:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: number formats.

Browse Source
This commit is contained in:
elforjani3
2021-01-14 13:36:27 +02:00
parent 244a32e5fd
commit 14f2fdf4fc
10 changed files with 317 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js
View File

@@ -1,4 +1,4 @@
import React from 'react';
import React, { useState } from 'react';
import {
NavbarGroup,
Button,
@@ -13,6 +13,7 @@ import classNames from 'classnames';
import Icon from 'components/Icon';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import NumberFormats from 'components/NumberFormats';
import { compose } from 'utils';
import withBalanceSheetDetail from './withBalanceSheetDetail';
@@ -49,7 +50,13 @@ function BalanceSheetActionsBar({
<Button
className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog-16" iconSize={16} />}
text={!balanceSheetFilter ? <T id={'customize_report'} /> : <T id={'hide_customizer'} />}
text={
!balanceSheetFilter ? (
<T id={'customize_report'} />
) : (
<T id={'hide_customizer'} />
)
}
onClick={handleFilterToggleClick}
active={balanceSheetFilter}
/>
@@ -66,6 +73,18 @@ function BalanceSheetActionsBar({
icon={<Icon icon="filter-16" iconSize={16} />}
/>
</Popover>
<Popover
content={<NumberFormats />}
minimal={true}
interactionKind={PopoverInteractionKind.CLICK}
position={Position.BOTTOM_LEFT}
>
<Button
className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'format'} />}
icon={<Icon icon="filter-16" iconSize={16} />}
/>
</Popover>
<NavbarDivider />

40
client/src/containers/Items/ItemsList.js
View File

@@ -93,6 +93,33 @@ function ItemsList({
setDeleteItem(false);
}, [setDeleteItem]);
const handleDeleteErrors = (errors) => {
if (
errors.find((error) => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTINS')
) {
AppToaster.show({
message: formatMessage({
id: 'the_item_has_associated_transactions',
}),
intent: Intent.DANGER,
});
}
if (
errors.find(
(error) => error.type === 'ITEM_HAS_ASSOCIATED_INVENTORY_ADJUSTMENT',
)
) {
AppToaster.show({
message: formatMessage({
id:
'you_could_not_delete_item_that_has_associated_inventory_adjustments_transacions',
}),
intent: Intent.DANGER,
});
}
};
// handle confirm delete item.
const handleConfirmDeleteItem = useCallback(() => {
requestDeleteItem(deleteItem.id)
@@ -107,19 +134,8 @@ function ItemsList({
setDeleteItem(false);
})
.catch(({ errors }) => {
if (
errors.find(
(error) => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTINS',
)
) {
AppToaster.show({
message: formatMessage({
id: 'the_item_has_associated_transactions',
}),
intent: Intent.DANGER,
});
}
setDeleteItem(false);
handleDeleteErrors(errors);
});
}, [requestDeleteItem, deleteItem, formatMessage]);