feat: fix cash flow drawer.

This commit is contained in:
elforjani13
2021-10-27 18:06:26 +02:00
parent c462681c70
commit f1fec69d52
3 changed files with 7 additions and 32 deletions

View File

@@ -4,7 +4,7 @@ import { T, FormatNumber } from '../../../components';
export default function CashflowTransactionDrawerFooter() {
const {
cashflowTransaction: { amount },
cashflowTransaction: { formatted_amount },
} = useCashflowTransactionDrawerContext();
return (
@@ -15,18 +15,18 @@ export default function CashflowTransactionDrawerFooter() {
<T id={'manual_journal.details.subtotal'} />
</div>
<div class="debit">
<FormatNumber value={amount} />
<FormatNumber value={formatted_amount} />
</div>
<div class="credit">
<FormatNumber value={amount} />
<FormatNumber value={formatted_amount} />
</div>
</div>
<div class="total-lines__line total-lines__line--total">
<div class="title">
<T id={'manual_journal.details.total'} />
</div>
<div class="debit">{amount}</div>
<div class="credit">{amount}</div>
<div class="debit">{formatted_amount}</div>
<div class="credit">{formatted_amount}</div>
</div>
</div>
</div>

View File

@@ -14,7 +14,7 @@ import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawer
export default function CashflowTransactionDrawerHeader() {
const {
cashflowTransaction: {
amount,
formatted_amount,
transaction_type,
transaction_number,
reference_no,
@@ -27,7 +27,7 @@ export default function CashflowTransactionDrawerHeader() {
<div className={'cashflow-drawer__content-header'}>
<DetailsMenu>
<DetailItem name={'total'} label={<T id={'total'} />}>
<h3 class="amount">{amount}</h3>
<h3 class="amount">{formatted_amount}</h3>
</DetailItem>
<DetailItem

View File

@@ -4,24 +4,6 @@ import { Classes, Tooltip, Position } from '@blueprintjs/core';
import { FormatNumberCell, If, Icon } from '../../../components';
/**
* Note column accessor.
*/
export function NoteAccessor(row) {
return (
<If condition={row.note}>
<Tooltip
className={Classes.TOOLTIP_INDICATOR}
content={row.note}
position={Position.LEFT_TOP}
hoverOpenDelay={50}
>
<Icon icon={'file-alt'} iconSize={16} />
</Tooltip>
</If>
);
}
/**
* Retrieve cashflow transaction entries columns.
*/
@@ -42,13 +24,6 @@ export const useCashflowTransactionColumns = () =>
disableSortBy: true,
className: 'contact',
},
{
Header: intl.get('note'),
accessor: NoteAccessor,
width: 80,
disableSortBy: true,
className: 'note',
},
{
Header: intl.get('credit'),
accessor: 'credit',