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

fix(webapp): use the server formatted value

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-12-04 08:31:18 +02:00
parent fb70c94465
commit 33afa3af64
12 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/webapp/src/containers/Drawers/BillDrawer/utils.tsx
View File

@@ -63,8 +63,7 @@ export const useBillReadonlyEntriesTableColumns = () => {
}, },
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate_formatted',
Cell: FormatNumberCell,
width: getColumnWidth(entries, 'rate', { width: getColumnWidth(entries, 'rate', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
@@ -75,9 +74,8 @@ export const useBillReadonlyEntriesTableColumns = () => {
}, },
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'total_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'total_formatted', {
width: getColumnWidth(entries, 'amount', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

10
packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/utils.tsx
View File

@@ -60,9 +60,8 @@ export const useCreditNoteReadOnlyEntriesColumns = () => {
}, },
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'rate_formatted', {
width: getColumnWidth(entries, 'rate', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),
@@ -72,9 +71,8 @@ export const useCreditNoteReadOnlyEntriesColumns = () => {
}, },
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'total_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'total_formatted', {
width: getColumnWidth(entries, 'amount', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

9
packages/webapp/src/containers/Drawers/EstimateDetailDrawer/utils.tsx
View File

@@ -47,9 +47,8 @@ export const useEstimateReadonlyEntriesColumns = () => {
}, },
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'rate_formatted', {
width: getColumnWidth(entries, 'rate', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),
@@ -59,9 +58,9 @@ export const useEstimateReadonlyEntriesColumns = () => {
}, },
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'total_formatted',
Cell: FormatNumberCell, Cell: FormatNumberCell,
width: getColumnWidth(entries, 'amount', { width: getColumnWidth(entries, 'total_formatted', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

2
packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
View File

@@ -23,7 +23,7 @@ export function InvoiceDetailTableFooter() {
<InvoiceTotalLines labelColWidth={'180px'} amountColWidth={'180px'}> <InvoiceTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
<TotalLine <TotalLine
title={<T id={'invoice.details.subtotal'} />} title={<T id={'invoice.details.subtotal'} />}
value={<FormatNumber value={invoice.subtotal_formatted} />} value={invoice.subtotal_formatted}
borderStyle={TotalLineBorderStyle.SingleDark} borderStyle={TotalLineBorderStyle.SingleDark}
/> />
{invoice.taxes.map((taxRate) => ( {invoice.taxes.map((taxRate) => (

10
packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/utils.tsx
View File

@@ -64,24 +64,22 @@ export const useInvoiceReadonlyEntriesColumns = () => {
}, },
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate_formatted',
Cell: FormatNumberCell,
align: 'right', align: 'right',
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
width: getColumnWidth(entries, 'rate', { width: getColumnWidth(entries, 'rate_formatted', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),
}, },
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'total_formatted',
Cell: FormatNumberCell,
align: 'right', align: 'right',
disableSortBy: true, disableSortBy: true,
textOverview: true, textOverview: true,
width: getColumnWidth(entries, 'amount', { width: getColumnWidth(entries, 'total_formatted', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

5
packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/utils.tsx
View File

@@ -52,9 +52,8 @@ export const usePaymentMadeEntriesColumns = () => {
}, },
{ {
Header: intl.get('payment_amount'), Header: intl.get('payment_amount'),
accessor: 'payment_amount', accessor: 'payment_amount_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'payment_amount_formatted', {
width: getColumnWidth(entries, 'payment_amount', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

5
packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/utils.tsx
View File

@@ -63,10 +63,9 @@ export const usePaymentReceiveEntriesColumns = () => {
}, },
{ {
Header: intl.get('payment_amount'), Header: intl.get('payment_amount'),
accessor: 'invoice.payment_amount', accessor: 'payment_amount_formatted',
Cell: FormatNumberCell,
align: 'right', align: 'right',
width: getColumnWidth(entries, 'invoice.payment_amount', { width: getColumnWidth(entries, 'payment_amount_formatted', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

7
packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.tsx
View File

@@ -18,12 +18,9 @@ function ReceiptDetailDrawerProvider({ receiptId, ...props }) {
const { featureCan } = useFeatureCan(); const { featureCan } = useFeatureCan();
// Fetch sale receipt details. // Fetch sale receipt details.
const { data: receipt, isFetching: isReceiptLoading } = useReceipt( const { data: receipt, isLoading: isReceiptLoading } = useReceipt(receiptId, {
receiptId,
{
enabled: !!receiptId, enabled: !!receiptId,
}, });
);
// Provider. // Provider.
const provider = { const provider = {

2
packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailTableFooter.tsx
View File

@@ -23,7 +23,7 @@ export default function ReceiptDetailTableFooter() {
<ReceiptTotalLines labelColWidth={'180px'} amountColWidth={'180px'}> <ReceiptTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
<TotalLine <TotalLine
title={<T id={'receipt.details.subtotal'} />} title={<T id={'receipt.details.subtotal'} />}
value={<FormatNumber value={receipt.amount} />} value={receipt.formatted_amount}
/> />
<TotalLine <TotalLine
title={<T id={'receipt.details.total'} />} title={<T id={'receipt.details.total'} />}

6
packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/utils.tsx
View File

@@ -43,8 +43,7 @@ export const useReceiptReadonlyEntriesTableColumns = () => {
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'rate_formatted', {
width: getColumnWidth(entries, 'rate', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),
@@ -55,8 +54,7 @@ export const useReceiptReadonlyEntriesTableColumns = () => {
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'amount',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'total_formatted', {
width: getColumnWidth(entries, 'amount', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),

2
packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx
View File

@@ -23,7 +23,7 @@ export default function VendorCreditDetailDrawerFooter() {
<VendorCreditTotalLines labelColWidth={'180px'} amountColWidth={'180px'}> <VendorCreditTotalLines labelColWidth={'180px'} amountColWidth={'180px'}>
<TotalLine <TotalLine
title={<T id={'vendor_credit.drawer.label_subtotal'} />} title={<T id={'vendor_credit.drawer.label_subtotal'} />}
value={<FormatNumber value={vendorCredit.formatted_amount} />} value={vendorCredit.formatted_amount}
borderStyle={TotalLineBorderStyle.SingleDark} borderStyle={TotalLineBorderStyle.SingleDark}
/> />
<TotalLine <TotalLine

10
packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/utils.tsx
View File

@@ -61,9 +61,8 @@ export const useVendorCreditReadonlyEntriesTableColumns = () => {
}, },
{ {
Header: intl.get('rate'), Header: intl.get('rate'),
accessor: 'rate', accessor: 'rate_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'rate_formatted', {
width: getColumnWidth(entries, 'rate', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),
@@ -73,9 +72,8 @@ export const useVendorCreditReadonlyEntriesTableColumns = () => {
}, },
{ {
Header: intl.get('amount'), Header: intl.get('amount'),
accessor: 'amount', accessor: 'total_formatted',
Cell: FormatNumberCell, width: getColumnWidth(entries, 'total_formatted', {
width: getColumnWidth(entries, 'amount', {
minWidth: 60, minWidth: 60,
magicSpacing: 5, magicSpacing: 5,
}), }),