From 53320e4c6194c05bdd1783ee4c492cea8f994990 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Sun, 20 Dec 2020 21:05:48 +0200 Subject: [PATCH] fix: baseCurrency in sales. --- .../Sales/Estimate/EstimateFormHeader.js | 19 +++++++++---------- .../Sales/Invoice/InvoiceFormHeader.js | 15 ++++++++++++--- .../Sales/Receipt/ReceiptFormHeader.js | 17 +++++++++++++++-- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/client/src/containers/Sales/Estimate/EstimateFormHeader.js b/client/src/containers/Sales/Estimate/EstimateFormHeader.js index 20b4d57f1..ce65f575b 100644 --- a/client/src/containers/Sales/Estimate/EstimateFormHeader.js +++ b/client/src/containers/Sales/Estimate/EstimateFormHeader.js @@ -1,22 +1,22 @@ import React, { useMemo } from 'react'; -import { compose } from 'utils'; import classNames from 'classnames'; import { sumBy } from 'lodash'; import { useFormikContext } from 'formik'; import { CLASSES } from 'common/classes'; -import { PageFormBigNumber } from 'components'; - -import withCustomers from 'containers/Customers/withCustomers'; -import withDialogActions from 'containers/Dialog/withDialogActions'; - import EstimateFormHeaderFields from './EstimateFormHeaderFields'; +import { PageFormBigNumber } from 'components'; +import withSettings from 'containers/Settings/withSettings'; +import { compose } from 'utils'; // Estimate form top header. function EstimateFormHeader({ // #ownProps onEstimateNumberChanged, + + // #withSettings + baseCurrency, }) { const { values } = useFormikContext(); @@ -33,15 +33,14 @@ function EstimateFormHeader({ ); } export default compose( - withCustomers(({ customers }) => ({ - customers, + withSettings(({ organizationSettings }) => ({ + baseCurrency: organizationSettings?.baseCurrency, })), - withDialogActions, )(EstimateFormHeader); diff --git a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js index 671dc262f..f0809033d 100644 --- a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js +++ b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js @@ -4,16 +4,20 @@ import { sumBy } from 'lodash'; import { useFormikContext } from 'formik'; import { CLASSES } from 'common/classes'; - import InvoiceFormHeaderFields from './InvoiceFormHeaderFields'; + import { PageFormBigNumber } from 'components'; +import withSettings from 'containers/Settings/withSettings'; +import { compose } from 'redux'; /** * Invoice form header section. */ -export default function InvoiceFormHeader({ +function InvoiceFormHeader({ // #ownProps onInvoiceNumberChanged, + // #withSettings + baseCurrency, }) { const { values } = useFormikContext(); @@ -30,8 +34,13 @@ export default function InvoiceFormHeader({ ); } +export default compose( + withSettings(({ organizationSettings }) => ({ + baseCurrency: organizationSettings?.baseCurrency, + })), +)(InvoiceFormHeader); diff --git a/client/src/containers/Sales/Receipt/ReceiptFormHeader.js b/client/src/containers/Sales/Receipt/ReceiptFormHeader.js index 5b1c9796d..38e7ea290 100644 --- a/client/src/containers/Sales/Receipt/ReceiptFormHeader.js +++ b/client/src/containers/Sales/Receipt/ReceiptFormHeader.js @@ -7,10 +7,17 @@ import { CLASSES } from 'common/classes'; import ReceiptFormHeaderFields from './ReceiptFormHeaderFields'; import { PageFormBigNumber } from 'components'; +import withSettings from 'containers/Settings/withSettings'; +import { compose } from 'redux'; -export default function ReceiptFormHeader({ +/** + * Receipt form header section. + */ +function ReceiptFormHeader({ // #ownProps onReceiptNumberChanged, + // #withSettings + baseCurrency, }) { const { values } = useFormikContext(); @@ -27,8 +34,14 @@ export default function ReceiptFormHeader({ ); } + +export default compose( + withSettings(({ organizationSettings }) => ({ + baseCurrency: organizationSettings?.baseCurrency, + })), +)(ReceiptFormHeader);