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

fix: add baseCurrency in sale & purchases data table.

Browse Source
This commit is contained in:
elforjani3
2021-01-08 23:59:14 +02:00
parent 0b70c7ba9f
commit e9222b87fd
7 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/containers/Purchases/Bill/BillFormHeader.js
View File

@@ -7,11 +7,18 @@ import { CLASSES } from 'common/classes';
import BillFormHeaderFields from './BillFormHeaderFields'; import BillFormHeaderFields from './BillFormHeaderFields';
import { PageFormBigNumber } from 'components'; import { PageFormBigNumber } from 'components';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'redux';
/** /**
* Fill form header. * Fill form header.
*/ */
export default function BillFormHeader({ onBillNumberChanged }) { function BillFormHeader({
onBillNumberChanged,
// #withSettings
baseCurrency,
}) {
const { values } = useFormikContext(); const { values } = useFormikContext();
// Calculate the total due amount of bill entries. // Calculate the total due amount of bill entries.
@@ -25,8 +32,13 @@ export default function BillFormHeader({ onBillNumberChanged }) {
<PageFormBigNumber <PageFormBigNumber
label={'Due Amount'} label={'Due Amount'}
amount={totalDueAmount} amount={totalDueAmount}
currencyCode={'LYD'} currencyCode={baseCurrency}
/> />
</div> </div>
); );
} }
export default compose(
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(BillFormHeader);

12
client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js
View File

@@ -23,6 +23,7 @@ import PaymentMadesEmptyStatus from './PaymentMadesEmptyStatus';
import withPaymentMade from './withPaymentMade'; import withPaymentMade from './withPaymentMade';
import withPaymentMadeActions from './withPaymentMadeActions'; import withPaymentMadeActions from './withPaymentMadeActions';
import withCurrentView from 'containers/Views/withCurrentView'; import withCurrentView from 'containers/Views/withCurrentView';
import withSettings from 'containers/Settings/withSettings';
/** /**
* Payment made datatable transactions. * Payment made datatable transactions.
@@ -38,6 +39,9 @@ function PaymentMadeDataTable({
// #withPaymentMadeActions // #withPaymentMadeActions
addPaymentMadesTableQueries, addPaymentMadesTableQueries,
// #withSettings
baseCurrency,
// #ownProps // #ownProps
onEditPaymentMade, onEditPaymentMade,
onDeletePaymentMade, onDeletePaymentMade,
@@ -110,7 +114,8 @@ function PaymentMadeDataTable({
{ {
id: 'payment_number', id: 'payment_number',
Header: formatMessage({ id: 'payment_number' }), Header: formatMessage({ id: 'payment_number' }),
accessor: (row) => (row.payment_number ? `#${row.payment_number}` : null), accessor: (row) =>
row.payment_number ? `#${row.payment_number}` : null,
width: 140, width: 140,
className: 'payment_number', className: 'payment_number',
}, },
@@ -124,7 +129,7 @@ function PaymentMadeDataTable({
{ {
id: 'amount', id: 'amount',
Header: formatMessage({ id: 'amount' }), Header: formatMessage({ id: 'amount' }),
accessor: (r) => <Money amount={r.amount} currency={'USD'} />, accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
width: 140, width: 140,
className: 'amount', className: 'amount',
}, },
@@ -238,4 +243,7 @@ export default compose(
paymentMadesCurrentViewId, paymentMadesCurrentViewId,
}), }),
), ),
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(PaymentMadeDataTable); )(PaymentMadeDataTable);

4
client/src/containers/Purchases/PaymentMades/PaymentMadeFormHeader.js
View File

@@ -170,7 +170,7 @@ function PaymentMadeFormHeader({
className={'receive-full-amount'} className={'receive-full-amount'}
> >
Receive full amount ( Receive full amount (
<Money amount={payableFullAmount} currency={'USD'} />) <Money amount={payableFullAmount} currency={baseCurrency} />)
</a> </a>
</FormGroup> </FormGroup>
@@ -250,7 +250,7 @@ function PaymentMadeFormHeader({
<div class="big-amount"> <div class="big-amount">
<span class="big-amount__label">Amount Received</span> <span class="big-amount__label">Amount Received</span>
<h1 class="big-amount__number"> <h1 class="big-amount__number">
<Money amount={amountPaid} currency={'USD'} /> <Money amount={amountPaid} currency={baseCurrency} />
</h1> </h1>
</div> </div>
</div> </div>

9
client/src/containers/Sales/Estimate/EstimatesDataTable.js
View File

@@ -23,6 +23,7 @@ import EstimatesEmptyStatus from './EstimatesEmptyStatus';
import { statusAccessor } from './components'; import { statusAccessor } from './components';
import withEstimates from './withEstimates'; import withEstimates from './withEstimates';
import withEstimateActions from './withEstimateActions'; import withEstimateActions from './withEstimateActions';
import withSettings from 'containers/Settings/withSettings';
// Estimates transactions datatable. // Estimates transactions datatable.
function EstimatesDataTable({ function EstimatesDataTable({
@@ -36,6 +37,9 @@ function EstimatesDataTable({
// #withEstimatesActions // #withEstimatesActions
addEstimatesTableQueries, addEstimatesTableQueries,
// #withSettings
baseCurrency,
// #ownProps // #ownProps
onEditEstimate, onEditEstimate,
onDeleteEstimate, onDeleteEstimate,
@@ -160,7 +164,7 @@ function EstimatesDataTable({
{ {
id: 'amount', id: 'amount',
Header: formatMessage({ id: 'amount' }), Header: formatMessage({ id: 'amount' }),
accessor: (r) => <Money amount={r.amount} currency={'USD'} />, accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
width: 140, width: 140,
className: 'amount', className: 'amount',
@@ -282,4 +286,7 @@ export default compose(
estimatesCurrentViewId, estimatesCurrentViewId,
}), }),
), ),
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(EstimatesDataTable); )(EstimatesDataTable);

9
client/src/containers/Sales/Invoice/InvoicesDataTable.js
View File

@@ -35,6 +35,7 @@ import withViewDetails from 'containers/Views/withViewDetails';
import withInvoices from './withInvoices'; import withInvoices from './withInvoices';
import withInvoiceActions from './withInvoiceActions'; import withInvoiceActions from './withInvoiceActions';
import withCurrentView from 'containers/Views/withCurrentView'; import withCurrentView from 'containers/Views/withCurrentView';
import withSettings from 'containers/Settings/withSettings';
// Invoices datatable. // Invoices datatable.
function InvoicesDataTable({ function InvoicesDataTable({
@@ -47,6 +48,9 @@ function InvoicesDataTable({
// #withInvoicesActions // #withInvoicesActions
addInvoiceTableQueries, addInvoiceTableQueries,
// #withSettings
baseCurrency,
// #OwnProps // #OwnProps
onEditInvoice, onEditInvoice,
onDeleteInvoice, onDeleteInvoice,
@@ -141,7 +145,7 @@ function InvoicesDataTable({
{ {
id: 'balance', id: 'balance',
Header: formatMessage({ id: 'balance' }), Header: formatMessage({ id: 'balance' }),
accessor: (r) => <Money amount={r.balance} currency={'USD'} />, accessor: (r) => <Money amount={r.balance} currency={baseCurrency} />,
width: 140, width: 140,
className: 'balance', className: 'balance',
}, },
@@ -263,5 +267,8 @@ export default compose(
invoicesCurrentViewId, invoicesCurrentViewId,
}), }),
), ),
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
withViewDetails(), withViewDetails(),
)(InvoicesDataTable); )(InvoicesDataTable);

69
client/src/containers/Sales/PaymentReceive/PaymentReceivesDataTable.js
View File

@@ -28,6 +28,7 @@ import withViewDetails from 'containers/Views/withViewDetails';
import withPaymentReceives from './withPaymentReceives'; import withPaymentReceives from './withPaymentReceives';
import withPaymentReceivesActions from './withPaymentReceivesActions'; import withPaymentReceivesActions from './withPaymentReceivesActions';
import withCurrentView from 'containers/Views/withCurrentView'; import withCurrentView from 'containers/Views/withCurrentView';
import withSettings from 'containers/Settings/withSettings';
function PaymentReceivesDataTable({ function PaymentReceivesDataTable({
// #withPaymentReceives // #withPaymentReceives
@@ -40,6 +41,9 @@ function PaymentReceivesDataTable({
// #withPaymentReceivesActions // #withPaymentReceivesActions
addPaymentReceivesTableQueries, addPaymentReceivesTableQueries,
// #withSettings
baseCurrency,
// #OwnProps // #OwnProps
onEditPaymentReceive, onEditPaymentReceive,
onDeletePaymentReceive, onDeletePaymentReceive,
@@ -146,7 +150,7 @@ function PaymentReceivesDataTable({
{ {
id: 'amount', id: 'amount',
Header: formatMessage({ id: 'amount' }), Header: formatMessage({ id: 'amount' }),
accessor: (r) => <Money amount={r.amount} currency={'USD'} />, accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
width: 140, width: 140,
className: 'amount', className: 'amount',
}, },
@@ -186,40 +190,40 @@ function PaymentReceivesDataTable({
const showEmptyStatus = [ const showEmptyStatus = [
paymentReceivesCurrentViewId === -1, paymentReceivesCurrentViewId === -1,
PaymentReceivesCurrentPage.length === 0, PaymentReceivesCurrentPage.length === 0,
].every(condition => condition === true); ].every((condition) => condition === true);
return ( return (
<div className={classNames(CLASSES.DASHBOARD_DATATABLE)}> <div className={classNames(CLASSES.DASHBOARD_DATATABLE)}>
<LoadingIndicator <LoadingIndicator
loading={paymentReceivesLoading && !isLoaded} loading={paymentReceivesLoading && !isLoaded}
mount={false} mount={false}
> >
<Choose> <Choose>
<Choose.When condition={showEmptyStatus}> <Choose.When condition={showEmptyStatus}>
<PaymentReceivesEmptyStatus /> <PaymentReceivesEmptyStatus />
</Choose.When> </Choose.When>
<Choose.Otherwise> <Choose.Otherwise>
<DataTable <DataTable
columns={columns} columns={columns}
data={PaymentReceivesCurrentPage} data={PaymentReceivesCurrentPage}
onFetchData={handleDataTableFetchData} onFetchData={handleDataTableFetchData}
manualSortBy={true} manualSortBy={true}
selectionColumn={true} selectionColumn={true}
noInitialFetch={true} noInitialFetch={true}
sticky={true} sticky={true}
onSelectedRowsChange={handleSelectedRowsChange} onSelectedRowsChange={handleSelectedRowsChange}
rowContextMenu={onRowContextMenu} rowContextMenu={onRowContextMenu}
pagination={true} pagination={true}
autoResetSortBy={false} autoResetSortBy={false}
autoResetPage={false} autoResetPage={false}
pagesCount={paymentReceivesPageination.pagesCount} pagesCount={paymentReceivesPageination.pagesCount}
initialPageSize={paymentReceivesTableQuery.page_size} initialPageSize={paymentReceivesTableQuery.page_size}
initialPageIndex={paymentReceivesTableQuery.page - 1} initialPageIndex={paymentReceivesTableQuery.page - 1}
/> />
</Choose.Otherwise> </Choose.Otherwise>
</Choose> </Choose>
</LoadingIndicator> </LoadingIndicator>
</div> </div>
); );
} }
@@ -245,5 +249,8 @@ export default compose(
paymentReceivesCurrentViewId, paymentReceivesCurrentViewId,
}), }),
), ),
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
withViewDetails(), withViewDetails(),
)(PaymentReceivesDataTable); )(PaymentReceivesDataTable);

16
client/src/containers/Sales/Receipt/ReceiptsDataTable.js
View File

@@ -34,6 +34,7 @@ import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withReceipts from './withReceipts'; import withReceipts from './withReceipts';
import withReceiptActions from './withReceiptActions'; import withReceiptActions from './withReceiptActions';
import withSettings from 'containers/Settings/withSettings';
function ReceiptsDataTable({ function ReceiptsDataTable({
// #withReceipts // #withReceipts
@@ -46,6 +47,9 @@ function ReceiptsDataTable({
// #withReceiptsActions // #withReceiptsActions
addReceiptsTableQueries, addReceiptsTableQueries,
// #withSettings
baseCurrency,
// #ownProps // #ownProps
loading, loading,
onEditReceipt, onEditReceipt,
@@ -138,17 +142,10 @@ function ReceiptsDataTable({
width: 140, width: 140,
className: 'deposit_account', className: 'deposit_account',
}, },
// {
// id: 'send_to_email',
// Header: formatMessage({ id: 'email' }),
// accessor: 'send_to_email',
// width: 140,
// className: 'send_to_email',
// },
{ {
id: 'amount', id: 'amount',
Header: formatMessage({ id: 'amount' }), Header: formatMessage({ id: 'amount' }),
accessor: (r) => <Money amount={r.amount} currency={'USD'} />, accessor: (r) => <Money amount={r.amount} currency={baseCurrency} />,
width: 140, width: 140,
className: 'amount', className: 'amount',
@@ -287,4 +284,7 @@ export default compose(
receiptsCurrentViewId, receiptsCurrentViewId,
}), }),
), ),
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(ReceiptsDataTable); )(ReceiptsDataTable);