diff --git a/client/src/containers/Items/ItemsDataTable.js b/client/src/containers/Items/ItemsDataTable.js index 5f6ced6cf..3e57a1db8 100644 --- a/client/src/containers/Items/ItemsDataTable.js +++ b/client/src/containers/Items/ItemsDataTable.js @@ -26,6 +26,7 @@ import { CLASSES } from 'common/classes'; import withItems from 'containers/Items/withItems'; import withItemsActions from 'containers/Items/withItemsActions'; +import withSettings from 'containers/Settings/withSettings'; import { compose, saveInvoke, isBlank, defaultToTransform } from 'utils'; // Items datatable. @@ -40,6 +41,9 @@ function ItemsDataTable({ // #withItemsActions addItemsTableQueries, + // #withSettings + baseCurrency, + // props onEditItem, onDeleteItem, @@ -176,7 +180,7 @@ function ItemsDataTable({ Header: formatMessage({ id: 'sell_price' }), accessor: (row) => !isBlank(row.sell_price) ? ( - + ) : ( '' ), @@ -187,7 +191,7 @@ function ItemsDataTable({ Header: formatMessage({ id: 'cost_price' }), accessor: (row) => !isBlank(row.cost_price) ? ( - + ) : ( '' ), @@ -292,5 +296,8 @@ export default compose( itemsPagination, }), ), + withSettings(({ organizationSettings }) => ({ + baseCurrency: organizationSettings?.baseCurrency, + })), withItemsActions, )(ItemsDataTable); diff --git a/client/src/containers/Purchases/Bill/BillsDataTable.js b/client/src/containers/Purchases/Bill/BillsDataTable.js index 42a3dc983..76fcdbcf9 100644 --- a/client/src/containers/Purchases/Bill/BillsDataTable.js +++ b/client/src/containers/Purchases/Bill/BillsDataTable.js @@ -17,11 +17,11 @@ import moment from 'moment'; import classNames from 'classnames'; import Icon from 'components/Icon'; -import { compose, saveInvoke } from 'utils'; +import { compose, saveInvoke, isBlank } from 'utils'; import { CLASSES } from 'common/classes'; import { useIsValuePassed } from 'hooks'; -import { LoadingIndicator, Choose, If } from 'components'; +import { LoadingIndicator, Money, Choose, If } from 'components'; import DataTable from 'components/DataTable'; import BillsEmptyStatus from './BillsEmptyStatus'; @@ -32,6 +32,7 @@ import withViewDetails from 'containers/Views/withViewDetails'; import withBills from './withBills'; import withBillActions from './withBillActions'; import withCurrentView from 'containers/Views/withCurrentView'; +import withSettings from 'containers/Settings/withSettings'; // Bills transactions datatable. function BillsDataTable({ @@ -52,6 +53,9 @@ function BillsDataTable({ // #withView viewMeta, + // #withSettings + baseCurrency, + // #ownProps loading, onFetchData, @@ -166,7 +170,12 @@ function BillsDataTable({ { id: 'amount', Header: formatMessage({ id: 'amount' }), - accessor: 'amount', + accessor: (row) => + !isBlank(row.amount) ? ( + + ) : ( + '' + ), width: 140, className: 'amount', }, @@ -284,5 +293,8 @@ export default compose( billsCurrentViewId, }), ), + withSettings(({ organizationSettings }) => ({ + baseCurrency: organizationSettings?.baseCurrency, + })), withViewDetails(), )(BillsDataTable); diff --git a/client/src/containers/Vendors/VendorsList.js b/client/src/containers/Vendors/VendorsList.js index 0511f4aa1..ca6c98d23 100644 --- a/client/src/containers/Vendors/VendorsList.js +++ b/client/src/containers/Vendors/VendorsList.js @@ -128,7 +128,7 @@ function VendorsList({ return (