feat:(*): add currency code.

This commit is contained in:
elforjani3
2021-03-08 14:17:08 +02:00
parent 644b673411
commit 32b378e74e
17 changed files with 39 additions and 24 deletions

View File

@@ -35,7 +35,10 @@ function PaperTemplate({ labels: propLabels, paperData, entries }) {
defaultLabels={labels}
headerData={defaultValues}
/>
<PaperTemplateTable tableData={updateItemsEntriesTotal(entries)} />
<PaperTemplateTable
tableData={updateItemsEntriesTotal(entries)}
currencyCode={paperData.currency_code}
/>
<PaperTemplateFooter footerData={defaultValues} />
</div>
</div>

View File

@@ -3,7 +3,7 @@ import { TemplateHeader, TemplateContent } from '../components';
export default function PaperTemplateHeader({
defaultLabels,
headerData: { referenceNo, amount, dueDate, date, billedTo },
headerData: { referenceNo, amount, dueDate, date, billedTo, currency_code },
}) {
return (
<>
@@ -16,6 +16,7 @@ export default function PaperTemplateHeader({
amount={amount}
billedFrom={''}
dueDate={dueDate}
currencyCode={currency_code}
/>
</>
);

View File

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
import { formatMessage } from 'services/intl';
import { DataTable, Money } from 'components';
export default function DrawerTemplateTable({ tableData }) {
export default function DrawerTemplateTable({ tableData, currencyCode }) {
const columns = useMemo(
() => [
{
@@ -14,7 +14,7 @@ export default function DrawerTemplateTable({ tableData }) {
{
Header: formatMessage({ id: 'rate' }),
accessor: 'rate',
accessor: ({ rate }) => <Money amount={rate} currency={'USD'} />,
accessor: ({ rate }) => <Money amount={rate} currency={currencyCode} />,
disableSortBy: true,
width: 50,
},
@@ -26,7 +26,9 @@ export default function DrawerTemplateTable({ tableData }) {
},
{
Header: formatMessage({ id: 'Total' }),
accessor: ({ total }) => <Money amount={total} currency={'USD'} />,
accessor: ({ total }) => (
<Money amount={total} currency={currencyCode} />
),
disableSortBy: true,
width: 50,
},

View File

@@ -36,7 +36,10 @@ export default function PaymentPaperTemplate({
defaultLabels={labels}
headerData={defaultValues}
/>
<PaymentPaperTemplateTable tableData={entries} />
<PaymentPaperTemplateTable
tableData={entries}
currencyCode={paperData.currency_code}
/>
</div>
))}
</div>

View File

@@ -3,7 +3,7 @@ import { TemplateHeader, TemplateContent } from '../components';
export default function PaymentPaperTemplateHeader({
defaultLabels,
headerData: { referenceNo, amount, date, billedTo },
headerData: { referenceNo, amount, date, billedTo, currency_code },
}) {
return (
<>
@@ -15,6 +15,7 @@ export default function PaymentPaperTemplateHeader({
referenceNo={referenceNo}
amount={amount}
billedFrom={''}
currency={currency_code}
/>
</>
);

View File

@@ -3,7 +3,7 @@ import moment from 'moment';
import { formatMessage } from 'services/intl';
import { DataTable, Money } from 'components';
export default function PaymentPaperTemplateTable({ tableData }) {
export default function PaymentPaperTemplateTable({ tableData, currencyCode }) {
const columns = React.useMemo(
() => [
{
@@ -20,14 +20,14 @@ export default function PaymentPaperTemplateTable({ tableData }) {
{
Header: formatMessage({ id: 'invoice_amount' }),
accessor: ({ invoice }) => (
<Money amount={invoice.balance} currency={'USD'} />
<Money amount={invoice.balance} currency={currencyCode} />
),
disableSortBy: true,
},
{
Header: formatMessage({ id: 'payment_amount' }),
accessor: ({ payment_amount }) => (
<Money amount={payment_amount} currency={'USD'} />
<Money amount={payment_amount} currency={currencyCode} />
),
disableSortBy: true,
},

View File

@@ -20,6 +20,7 @@ export const TemplateContent = ({
amount,
billedFrom,
dueDate,
currencyCode,
}) => (
<div className="template__content">
<div className="template__content__info">
@@ -37,7 +38,7 @@ export const TemplateContent = ({
<div className="template__content__info">
<span> {defaultLabels.amount} </span>
<p className={'info-paragraph-amount'}>
{<Money amount={amount} currency={'USD'} />}
{<Money amount={amount} currency={currencyCode} />}
</p>
</div>
<div className="template__content__info">