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

feat(Sales & Purchases ): add currency in header & entries.

Browse Source
This commit is contained in:
elforjani13
2022-02-23 14:47:12 +02:00
parent e6a7c7bc58
commit 22eb7a1cc1
17 changed files with 83 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.js
View File

@@ -3,23 +3,18 @@ import classNames from 'classnames';
import { useFormikContext } from 'formik';
import { sumBy } from 'lodash';
import { CLASSES } from 'common/classes';
import { compose } from 'utils';
import { Money } from 'components';
import { FormattedMessage as T } from 'components';
import PaymentMadeFormHeaderFields from './PaymentMadeFormHeaderFields';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
/**
* Payment made header form.
*/
function PaymentMadeFormHeader({
// #withCurrentOrganization
organization: { base_currency },
}) {
function PaymentMadeFormHeader() {
// Formik form context.
const {
values: { entries },
values: { entries, currency_code },
} = useFormikContext();
// Calculate the payment amount of the entries.
@@ -36,7 +31,7 @@ function PaymentMadeFormHeader({
<T id={'amount_received'} />
</span>
<h1 class="big-amount__number">
<Money amount={amountPaid} currency={base_currency} />
<Money amount={amountPaid} currency={currency_code} />
</h1>
</div>
</div>
@@ -45,4 +40,4 @@ function PaymentMadeFormHeader({
);
}
export default compose(withCurrentOrganization())(PaymentMadeFormHeader);
export default PaymentMadeFormHeader;

13
src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
View File

@@ -111,6 +111,7 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
onContactSelected={(contact) => {
form.setFieldValue('vendor_id', contact.id);
form.setFieldValue('exchange_rate', '');
form.setFieldValue('currency_code', contact?.currency_code);
setPaymentVendorId(contact.id);
setSelectVendor(contact);
}}
@@ -162,7 +163,13 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
{/* ------------ Full amount ------------ */}
<Field name={'full_amount'}>
{({ form, field: { value }, meta: { error, touched } }) => (
{({
form: {
values: { currency_code },
},
field: { value },
meta: { error, touched },
}) => (
<FormGroup
label={<T id={'full_amount'} />}
inline={true}
@@ -172,7 +179,7 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
helperText={<ErrorMessage name="full_amount" />}
>
<ControlGroup>
<InputPrependText text={base_currency} />
<InputPrependText text={currency_code} />
<MoneyInputGroup
value={value}
onChange={(value) => {
@@ -189,7 +196,7 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
minimal={true}
>
<T id={'receive_full_amount'} /> (
<Money amount={payableFullAmount} currency={base_currency} />)
<Money amount={payableFullAmount} currency={currency_code} />)
</Button>
</FormGroup>
)}